August 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> master : - add support for SOLVER_SOLVABLE_REPO, used by SOLVER_DISTUPGRADE
by Michael Schroeder 25 Aug '09

25 Aug '09

ref: refs/heads/master commit 989e22234b532b60d4dea3a740ca022d039bbf64 Author: Michael Schroeder <mls(a)suse.de> Date: Tue Aug 25 14:17:09 2009 +0200 - add support for SOLVER_SOLVABLE_REPO, used by SOLVER_DISTUPGRADE - fix vendorcheck in solvable_identical --- src/rules.c | 2 ++ src/solvable.c | 3 ++- src/solver.c | 2 +- src/solver.h | 9 ++++++--- src/solverdebug.c | 6 ++++++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/rules.c b/src/rules.c index 225c4d8..d264647 100644 --- a/src/rules.c +++ b/src/rules.c @@ -1156,6 +1156,8 @@ solver_createdupmaps(Solver *solv) switch (how & SOLVER_JOBMASK) { case SOLVER_DISTUPGRADE: + if ((how & SOLVER_SELECTMASK) != SOLVER_SOLVABLE_REPO) + break; if (what <= 0 || what > pool->nrepos) break; repo = pool_id2repo(pool, what); diff --git a/src/solvable.c b/src/solvable.c index 6f6f590..dfe8ce1 100644 --- a/src/solvable.c +++ b/src/solvable.c @@ -508,7 +508,8 @@ solvable_identical(Solvable *s1, Solvable *s2) return 0; if (s1->evr != s2->evr) return 0; - if (s1->vendor != s2->vendor) + /* map missing vendor to empty string */ + if ((s1->vendor ? s1->vendor : 1) != (s2->vendor ? s2->vendor : 1)) return 0; /* looking good, try some fancier stuff */ diff --git a/src/solver.c b/src/solver.c index 842ad6b..da5493c 100644 --- a/src/solver.c +++ b/src/solver.c @@ -2796,7 +2796,7 @@ solver_solve(Solver *solv, Queue *job) } break; case SOLVER_DISTUPGRADE: - POOL_DEBUG(SAT_DEBUG_JOB, "job: distupgrade repo #%d\n", what); + POOL_DEBUG(SAT_DEBUG_JOB, "job: distupgrade %s\n", solver_select2str(solv, select, what)); break; default: POOL_DEBUG(SAT_DEBUG_JOB, "job: unknown job\n"); diff --git a/src/solver.h b/src/solver.h index 5b3884e..b93f9e2 100644 --- a/src/solver.h +++ b/src/solver.h @@ -216,6 +216,7 @@ typedef struct _Solver { #define SOLVER_SOLVABLE_NAME 0x02 #define SOLVER_SOLVABLE_PROVIDES 0x03 #define SOLVER_SOLVABLE_ONE_OF 0x04 +#define SOLVER_SOLVABLE_REPO 0x05 #define SOLVER_SELECTMASK 0xff @@ -359,9 +360,11 @@ solver_create_state_maps(Solver *solv, Map *installedmap, Map *conflictsmap) l = r->p; l; l = (dp != &r->w2 + 1 ? *dp++ : 0)) /* iterate over all packages selected by a job */ -#define FOR_JOB_SELECT(p, pp, select, what) \ - for (pp = (select == SOLVER_SOLVABLE ? 0 : \ - select == SOLVER_SOLVABLE_ONE_OF ? what : \ +#define FOR_JOB_SELECT(p, pp, select, what) \ + if (select == SOLVER_SOLVABLE_REPO) \ + p = pp = 0; \ + else for (pp = (select == SOLVER_SOLVABLE ? 0 : \ + select == SOLVER_SOLVABLE_ONE_OF ? what : \ pool_whatprovides(pool, what)), \ p = (select == SOLVER_SOLVABLE ? what : pool->whatprovidesdata[pp++]) ; p ; p = pool->whatprovidesdata[pp++]) \ if (select != SOLVER_SOLVABLE_NAME || pool_match_nevr(pool, pool->solvables + p, what)) diff --git a/src/solverdebug.c b/src/solverdebug.c index 48cfaba..1f1f9c6 100644 --- a/src/solverdebug.c +++ b/src/solverdebug.c @@ -795,5 +795,11 @@ solver_select2str(Solver *solv, Id select, Id what) } return *b ? b + 2 : "nothing"; } + if (select == SOLVER_SOLVABLE_REPO) + { + b = pool_alloctmpspace(pool, 20); + sprintf(b, "repo #%d", what); + return b; + } return "unknown job select"; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> SuSE-Code-11-Branch : - map missing vendor to empty string
by Michael Schroeder 17 Aug '09

17 Aug '09

ref: refs/heads/SuSE-Code-11-Branch commit df399982ffe60ea346117f393784e213acf77b55 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Aug 17 15:20:08 2009 +0200 - map missing vendor to empty string --- src/policy.c | 13 ++++++++----- src/solvable.c | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/policy.c b/src/policy.c index 713c193..5b5032a 100644 --- a/src/policy.c +++ b/src/policy.c @@ -417,19 +417,22 @@ int policy_illegal_vendorchange(Solver *solv, Solvable *s1, Solvable *s2) { Pool *pool = solv->pool; + Id v1, v2; Id vendormask1, vendormask2; if (solv && solv->vendorCheckCb) { /* The application is responsible for */ return solv->vendorCheckCb(solv->pool, s1, s2); } - - if (s1->vendor == s2->vendor) + /* treat a missing vendor as empty string */ + v1 = s1->vendor ? s1->vendor : ID_EMPTY; + v2 = s2->vendor ? s2->vendor : ID_EMPTY; + if (v1 == v2) return 0; - vendormask1 = pool_vendor2mask(pool, s1->vendor); + vendormask1 = pool_vendor2mask(pool, v1); if (!vendormask1) - return 0; - vendormask2 = pool_vendor2mask(pool, s2->vendor); + return 1; /* can't match */ + vendormask2 = pool_vendor2mask(pool, v2); if ((vendormask1 & vendormask2) != 0) return 0; return 1; diff --git a/src/solvable.c b/src/solvable.c index 722b82d..22f8df1 100644 --- a/src/solvable.c +++ b/src/solvable.c @@ -485,7 +485,8 @@ solvable_identical(Solvable *s1, Solvable *s2) return 0; if (s1->evr != s2->evr) return 0; - if (s1->vendor != s2->vendor) + /* map missing vendor to empty string */ + if ((s1->vendor ? s1->vendor : 1) != (s2->vendor ? s2->vendor : 1)) return 0; /* looking good, try some fancier stuff */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp-bindings> master : add coolos fixes
by Duncan Mac-Vicar P 12 Aug '09

12 Aug '09

ref: refs/heads/master commit 552be1f3bd756ced07566cec912d34189e08dac5 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Aug 12 17:40:48 2009 +0200 add coolos fixes --- libzypp-bindings.spec.in | 4 ++-- package/libzypp-bindings.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libzypp-bindings.spec.in b/libzypp-bindings.spec.in index a5fc442..23aa13e 100644 --- a/libzypp-bindings.spec.in +++ b/libzypp-bindings.spec.in @@ -71,8 +71,8 @@ Group: Development/Languages/Python %files -n python-zypp %defattr(-,root,root,-) -%{py_sitedir}/_zypp.so -%{py_sitedir}/zypp.py +%{python_sitelib}/_zypp.so +%{python_sitelib}/zypp.py %package -n perl-zypp Requires: perl = %{perl_version} diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index 866bbf6..0f02bad 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Aug 9 08:44:46 CEST 2009 - coolo(a)novell.com + +- use new python macros + +------------------------------------------------------------------- Mon Aug 3 16:47:24 CEST 2009 - ma(a)suse.de - Adappt to boost-1.39 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Install new headers.
by Ján Kupec 07 Aug '09

07 Aug '09

ref: refs/heads/master commit f05ef78790614079a6c63ac70c6517c076936655 Author: Ján Kupec <jkupec(a)suse.cz> Date: Fri Aug 7 13:59:32 2009 +0200 Install new headers. --- zypp/CMakeLists.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index 1a8d902..3b6a2c3 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -772,6 +772,11 @@ SET( zypp_misc_SRCS misc/CheckAccessDeleted.cc ) +INSTALL( FILES + ${zypp_misc_HEADERS} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/misc +) + #################################################################### SET( zypp_lib_SRCS -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : Install new headers.
by Ján Kupec 07 Aug '09

07 Aug '09

ref: refs/heads/ma-misc commit f05ef78790614079a6c63ac70c6517c076936655 Author: Ján Kupec <jkupec(a)suse.cz> Date: Fri Aug 7 13:59:32 2009 +0200 Install new headers. --- zypp/CMakeLists.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index 1a8d902..3b6a2c3 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -772,6 +772,11 @@ SET( zypp_misc_SRCS misc/CheckAccessDeleted.cc ) +INSTALL( FILES + ${zypp_misc_HEADERS} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/misc +) + #################################################################### SET( zypp_lib_SRCS -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : TODO update
by Ján Kupec 07 Aug '09

07 Aug '09

ref: refs/heads/master commit 2024d4d5311a4d525913252d98905542c3ee3891 Author: Ján Kupec <jkupec(a)suse.cz> Date: Fri Aug 7 13:08:49 2009 +0200 TODO update --- doc/TODO | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/doc/TODO b/doc/TODO index eb396ca..9509166 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,18 +1,8 @@ -1.1.x - development releases +1.2.x - development releases -+ configuration file (.zypperrc) + nice overall install progress with ETA -+ improved install summary, extended info available via prompt options - + show version/arch/vendor changes - + show recommended and suggested packages - + show changelog for selected packages or the whole update - + show graphical (schubi's widget) or ascii dependency tree of the packages - in the summary - + explain why a package has been selected for installation/removal - + and more... + --from option for the installing commands (in/up/patch/dup/inr/verify) + add help texts for all prompts -+ options to install/remove packages recommended/suggested packages 1.0.x - bugfixing for SLE11 and openSUSE 11.1 @@ -25,8 +15,17 @@ NOT SCHEDULED General ++ improved install summary, extended info available via prompt options + + show recommended and suggested packages + + show changelog for selected packages or the whole update + + show graphical (schubi's widget) or ascii dependency tree of the packages + in the summary + + explain why a package has been selected for installation/removal ++ options to install/remove packages recommended/suggested packages + more options in the media error prompt (e.g. eject CD) + testsuite ++ exit gracefully in first SIGINT, immediately on the second (needs proper + implementation) ? xml input (feed an xml with operation specification to zypper) ? move -vv output to zypper.log, leave only normal and verbose output levels? -vv e.g. displays full urls of downloaded files -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : fix specfile
by Michael Andres 07 Aug '09

07 Aug '09

ref: refs/heads/master commit 3ab5ac1b7c811b15d5926b25095e130987f02320 Author: Michael Andres <ma(a)suse.de> Date: Fri Aug 7 12:35:21 2009 +0200 fix specfile --- libzypp.spec.cmake | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index 3e8d2b8..a1d163e 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -136,7 +136,7 @@ make install DESTDIR=$RPM_BUILD_ROOT make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d mkdir -p $RPM_BUILD_ROOT/etc/zypp/services.d -mkdir -p $RPM_BUILD_ROOT/%{_usr}/lib/zypp/bin +mkdir -p $RPM_BUILD_ROOT/%{_usr}/lib/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/log/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/cache/zypp @@ -233,7 +233,7 @@ rm -rf "$RPM_BUILD_ROOT" %dir %{_var}/lib/zypp %dir %{_var}/log/zypp %dir %{_var}/cache/zypp -%{prefix}/lib/zypp +%dir %{prefix}/lib/zypp %{prefix}/share/zypp %{prefix}/share/applications/package-manager.desktop %{prefix}/share/icons/hicolor/scalable/apps/package-manager-icon.svg @@ -242,8 +242,7 @@ rm -rf "$RPM_BUILD_ROOT" %{prefix}/share/icons/hicolor/24x24/apps/package-manager-icon.png %{prefix}/share/icons/hicolor/32x32/apps/package-manager-icon.png %{prefix}/share/icons/hicolor/48x48/apps/package-manager-icon.png -%{prefix}/bin/package-manager -%{prefix}/bin/package-manager-su +%{prefix}/bin/* %{_libdir}/libzypp*so.* %doc %_mandir/man5/locks.5.* -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : fix specfile
by Michael Andres 07 Aug '09

07 Aug '09

ref: refs/heads/ma-misc commit 3ab5ac1b7c811b15d5926b25095e130987f02320 Author: Michael Andres <ma(a)suse.de> Date: Fri Aug 7 12:35:21 2009 +0200 fix specfile --- libzypp.spec.cmake | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index 3e8d2b8..a1d163e 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -136,7 +136,7 @@ make install DESTDIR=$RPM_BUILD_ROOT make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d mkdir -p $RPM_BUILD_ROOT/etc/zypp/services.d -mkdir -p $RPM_BUILD_ROOT/%{_usr}/lib/zypp/bin +mkdir -p $RPM_BUILD_ROOT/%{_usr}/lib/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/log/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/cache/zypp @@ -233,7 +233,7 @@ rm -rf "$RPM_BUILD_ROOT" %dir %{_var}/lib/zypp %dir %{_var}/log/zypp %dir %{_var}/cache/zypp -%{prefix}/lib/zypp +%dir %{prefix}/lib/zypp %{prefix}/share/zypp %{prefix}/share/applications/package-manager.desktop %{prefix}/share/icons/hicolor/scalable/apps/package-manager-icon.svg @@ -242,8 +242,7 @@ rm -rf "$RPM_BUILD_ROOT" %{prefix}/share/icons/hicolor/24x24/apps/package-manager-icon.png %{prefix}/share/icons/hicolor/32x32/apps/package-manager-icon.png %{prefix}/share/icons/hicolor/48x48/apps/package-manager-icon.png -%{prefix}/bin/package-manager -%{prefix}/bin/package-manager-su +%{prefix}/bin/* %{_libdir}/libzypp*so.* %doc %_mandir/man5/locks.5.* -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : backup
by Michael Andres 07 Aug '09

07 Aug '09

ref: refs/heads/master commit 98f1bec57a8a79f0c3eac51aeb4510678c1938e6 Author: Michael Andres <ma(a)suse.de> Date: Fri Aug 7 12:28:18 2009 +0200 backup --- devel/devel.ma/Main.cc | 56 +++++++++++++++++++++++++++++++---- devel/devel.ma/main.cc | 76 ++++++++++++----------------------------------- 2 files changed, 70 insertions(+), 62 deletions(-) diff --git a/devel/devel.ma/Main.cc b/devel/devel.ma/Main.cc index 55c0f42..8443087 100644 --- a/devel/devel.ma/Main.cc +++ b/devel/devel.ma/Main.cc @@ -1,11 +1,13 @@ #include "Tools.h" #include <zypp/PoolQuery.h> +#include <zypp/target/rpm/librpmDb.h> /////////////////////////////////////////////////////////////////// //static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" ); static const Pathname sysRoot( "/tmp/Local/ma/DNL-test" ); +//static const Pathname sysRoot( "/" ); /////////////////////////////////////////////////////////////////// @@ -14,17 +16,45 @@ bool solve() bool rres = false; { //zypp::base::LogControl::TmpLineWriter shutUp; - //rres = test.resolver().resolvePool(); + rres = getZYpp()->resolver()->resolvePool(); } if ( ! rres ) { ERR << "resolve " << rres << endl; + getZYpp()->resolver()->problems(); return false; } MIL << "resolve " << rres << endl; return true; } +bool upgrade() +{ + bool rres = false; + { + //zypp::base::LogControl::TmpLineWriter shutUp; + Measure x( "Upgrade" ); + rres = getZYpp()->resolver()->doUpgrade(); + } + if ( ! rres ) + { + Measure x( "Upgrade Error" ); + ERR << "upgrade " << rres << endl; + getZYpp()->resolver()->problems(); + return false; + } + MIL << "upgrade " << rres << endl; + return true; +} + +namespace zypp +{ + namespace target + { + void writeUpgradeTestcase(); + } +} + int main( int argc, char * argv[] ) try { --argc; @@ -33,6 +63,7 @@ try { INT << "===[START]==========================================" << endl; ZConfig::instance(); TestSetup::LoadSystemAt( sysRoot ); + getZYpp()->initializeTarget( sysRoot ); /////////////////////////////////////////////////////////////////// ResPool pool( ResPool::instance() ); sat::Pool satpool( sat::Pool::instance() ); @@ -41,12 +72,25 @@ try { USR << "pool: " << pool << endl; /////////////////////////////////////////////////////////////////// + if ( 1 ) + { + getZYpp()->resolver()->addRequire( Capability("emacs") ); + solve(); + vdumpPoolStats( USR << "Transacting:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + } + - getZYpp()->resolver()->addRequire( Capability("xteddy") ); - solve(); - vdumpPoolStats( USR << "Transacting:"<< endl, - make_filter_begin<resfilter::ByTransact>(pool), - make_filter_end<resfilter::ByTransact>(pool) ) << endl; + { + ZYppCommitPolicy policy; + policy.dryRun( true ); + policy.downloadMode( DownloadOnly ); + + USR << policy << endl; + ZYppCommitResult result( getZYpp()->commit( policy ) ); + USR << result << endl; + } /////////////////////////////////////////////////////////////////// diff --git a/devel/devel.ma/main.cc b/devel/devel.ma/main.cc index 28bddb7..948d73f 100644 --- a/devel/devel.ma/main.cc +++ b/devel/devel.ma/main.cc @@ -1,37 +1,31 @@ #include "Tools.h" +#include <zypp/ResPool.h> +#include <zypp/ResObjects.h> #include <zypp/PoolQuery.h> +#include <zypp/misc/CheckAccessDeleted.h> + /////////////////////////////////////////////////////////////////// -static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" ); +Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" ); /////////////////////////////////////////////////////////////////// -bool solve() -{ - bool rres = false; - { - //zypp::base::LogControl::TmpLineWriter shutUp; - //rres = test.resolver().resolvePool(); - } - if ( ! rres ) - { - ERR << "resolve " << rres << endl; - return false; - } - MIL << "resolve " << rres << endl; - return true; -} - int main( int argc, char * argv[] ) try { --argc; ++argv; zypp::base::LogControl::instance().logToStdErr(); INT << "===[START]==========================================" << endl; + if ( argc ) + { + unsetenv("SYSROOT"); + sysRoot = Pathname(*argv); + setenv( "ZYPP_CONF", (sysRoot/"etc/zypp.conf").c_str(), true ); + } ZConfig::instance(); - TestSetup::LoadSystemAt( sysRoot ); + //TestSetup::LoadSystemAt( sysRoot ); /////////////////////////////////////////////////////////////////// ResPool pool( ResPool::instance() ); sat::Pool satpool( sat::Pool::instance() ); @@ -40,46 +34,16 @@ try { USR << "pool: " << pool << endl; /////////////////////////////////////////////////////////////////// - if ( 1 ) - { - Measure x("-"); - sat::LookupAttr q( sat::SolvAttr::updateReference ); - for_( res, q.begin(), q.end() ) - { - MIL << res << endl; - } - } - - if ( 0 ) { - Measure( "x" ); - - PoolQuery q; - q.setMatchSubstring(); - q.setCaseSensitive( false ); - q.addAttribute( sat::SolvAttr::updateReference ); - - for_( it, q.begin(), q.end() ) - { - // for each matching patch - MIL << *it << endl; - - if ( 0 ) - { - for_( d, it.matchesBegin(), it.matchesEnd() ) - { - // for each matching updateReferenceId in that patch: - DBG << " - " << d->inSolvAttr() << "\t\"" << d->asString() << "\" has type \"" - << d->subFind( sat::SolvAttr::updateReferenceType ).asString() << "\"" << endl; - for_( s, d->subBegin(), d->subEnd() ) - { - DBG << " -" << s.inSolvAttr() << "\t\"" << s.asString() << "\"" << endl; - } - } - } - } + Measure x("x"); + CheckAccessDeleted checker; + USR << checker << endl; } - + SEC << CheckAccessDeleted::findService( "syslog" ) << endl; + SEC << CheckAccessDeleted::findService( "syslogd" ) << endl; + SEC << CheckAccessDeleted::findService( "ssh" ) << endl; + SEC << CheckAccessDeleted::findService( "sshd" ) << endl; + SEC << CheckAccessDeleted::findService( 3844 ) << endl; /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::instance().logNothing(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : backup
by Michael Andres 07 Aug '09

07 Aug '09

ref: refs/heads/ma-misc commit 98f1bec57a8a79f0c3eac51aeb4510678c1938e6 Author: Michael Andres <ma(a)suse.de> Date: Fri Aug 7 12:28:18 2009 +0200 backup --- devel/devel.ma/Main.cc | 56 +++++++++++++++++++++++++++++++---- devel/devel.ma/main.cc | 76 ++++++++++++----------------------------------- 2 files changed, 70 insertions(+), 62 deletions(-) diff --git a/devel/devel.ma/Main.cc b/devel/devel.ma/Main.cc index 55c0f42..8443087 100644 --- a/devel/devel.ma/Main.cc +++ b/devel/devel.ma/Main.cc @@ -1,11 +1,13 @@ #include "Tools.h" #include <zypp/PoolQuery.h> +#include <zypp/target/rpm/librpmDb.h> /////////////////////////////////////////////////////////////////// //static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" ); static const Pathname sysRoot( "/tmp/Local/ma/DNL-test" ); +//static const Pathname sysRoot( "/" ); /////////////////////////////////////////////////////////////////// @@ -14,17 +16,45 @@ bool solve() bool rres = false; { //zypp::base::LogControl::TmpLineWriter shutUp; - //rres = test.resolver().resolvePool(); + rres = getZYpp()->resolver()->resolvePool(); } if ( ! rres ) { ERR << "resolve " << rres << endl; + getZYpp()->resolver()->problems(); return false; } MIL << "resolve " << rres << endl; return true; } +bool upgrade() +{ + bool rres = false; + { + //zypp::base::LogControl::TmpLineWriter shutUp; + Measure x( "Upgrade" ); + rres = getZYpp()->resolver()->doUpgrade(); + } + if ( ! rres ) + { + Measure x( "Upgrade Error" ); + ERR << "upgrade " << rres << endl; + getZYpp()->resolver()->problems(); + return false; + } + MIL << "upgrade " << rres << endl; + return true; +} + +namespace zypp +{ + namespace target + { + void writeUpgradeTestcase(); + } +} + int main( int argc, char * argv[] ) try { --argc; @@ -33,6 +63,7 @@ try { INT << "===[START]==========================================" << endl; ZConfig::instance(); TestSetup::LoadSystemAt( sysRoot ); + getZYpp()->initializeTarget( sysRoot ); /////////////////////////////////////////////////////////////////// ResPool pool( ResPool::instance() ); sat::Pool satpool( sat::Pool::instance() ); @@ -41,12 +72,25 @@ try { USR << "pool: " << pool << endl; /////////////////////////////////////////////////////////////////// + if ( 1 ) + { + getZYpp()->resolver()->addRequire( Capability("emacs") ); + solve(); + vdumpPoolStats( USR << "Transacting:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + } + - getZYpp()->resolver()->addRequire( Capability("xteddy") ); - solve(); - vdumpPoolStats( USR << "Transacting:"<< endl, - make_filter_begin<resfilter::ByTransact>(pool), - make_filter_end<resfilter::ByTransact>(pool) ) << endl; + { + ZYppCommitPolicy policy; + policy.dryRun( true ); + policy.downloadMode( DownloadOnly ); + + USR << policy << endl; + ZYppCommitResult result( getZYpp()->commit( policy ) ); + USR << result << endl; + } /////////////////////////////////////////////////////////////////// diff --git a/devel/devel.ma/main.cc b/devel/devel.ma/main.cc index 28bddb7..948d73f 100644 --- a/devel/devel.ma/main.cc +++ b/devel/devel.ma/main.cc @@ -1,37 +1,31 @@ #include "Tools.h" +#include <zypp/ResPool.h> +#include <zypp/ResObjects.h> #include <zypp/PoolQuery.h> +#include <zypp/misc/CheckAccessDeleted.h> + /////////////////////////////////////////////////////////////////// -static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" ); +Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" ); /////////////////////////////////////////////////////////////////// -bool solve() -{ - bool rres = false; - { - //zypp::base::LogControl::TmpLineWriter shutUp; - //rres = test.resolver().resolvePool(); - } - if ( ! rres ) - { - ERR << "resolve " << rres << endl; - return false; - } - MIL << "resolve " << rres << endl; - return true; -} - int main( int argc, char * argv[] ) try { --argc; ++argv; zypp::base::LogControl::instance().logToStdErr(); INT << "===[START]==========================================" << endl; + if ( argc ) + { + unsetenv("SYSROOT"); + sysRoot = Pathname(*argv); + setenv( "ZYPP_CONF", (sysRoot/"etc/zypp.conf").c_str(), true ); + } ZConfig::instance(); - TestSetup::LoadSystemAt( sysRoot ); + //TestSetup::LoadSystemAt( sysRoot ); /////////////////////////////////////////////////////////////////// ResPool pool( ResPool::instance() ); sat::Pool satpool( sat::Pool::instance() ); @@ -40,46 +34,16 @@ try { USR << "pool: " << pool << endl; /////////////////////////////////////////////////////////////////// - if ( 1 ) - { - Measure x("-"); - sat::LookupAttr q( sat::SolvAttr::updateReference ); - for_( res, q.begin(), q.end() ) - { - MIL << res << endl; - } - } - - if ( 0 ) { - Measure( "x" ); - - PoolQuery q; - q.setMatchSubstring(); - q.setCaseSensitive( false ); - q.addAttribute( sat::SolvAttr::updateReference ); - - for_( it, q.begin(), q.end() ) - { - // for each matching patch - MIL << *it << endl; - - if ( 0 ) - { - for_( d, it.matchesBegin(), it.matchesEnd() ) - { - // for each matching updateReferenceId in that patch: - DBG << " - " << d->inSolvAttr() << "\t\"" << d->asString() << "\" has type \"" - << d->subFind( sat::SolvAttr::updateReferenceType ).asString() << "\"" << endl; - for_( s, d->subBegin(), d->subEnd() ) - { - DBG << " -" << s.inSolvAttr() << "\t\"" << s.asString() << "\"" << endl; - } - } - } - } + Measure x("x"); + CheckAccessDeleted checker; + USR << checker << endl; } - + SEC << CheckAccessDeleted::findService( "syslog" ) << endl; + SEC << CheckAccessDeleted::findService( "syslogd" ) << endl; + SEC << CheckAccessDeleted::findService( "ssh" ) << endl; + SEC << CheckAccessDeleted::findService( "sshd" ) << endl; + SEC << CheckAccessDeleted::findService( 3844 ) << endl; /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::instance().logNothing(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0