December 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11954 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/target/TargetCallbackReceiver.cc zypp/target/TargetImpl.cc
by mlandres＠svn.opensuse.org 18 Dec '08

18 Dec '08

Author: mlandres Date: Thu Dec 18 22:32:18 2008 New Revision: 11954 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11954&view=rev Log: - Fixed lost user request to abort during commit. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/target/TargetCallbackReceiver.cc trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11954&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Dec 18 22:32:18 2008 @@ -63,6 +63,6 @@ SET(LIBZYPP_MINOR "25") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.24.7 (23) +# LAST RELEASED: 5.25.0 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Dec 18 22:32:18 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Dec 18 22:26:18 CET 2008 - ma(a)suse.de + +- Fixed lost user request to abort during commit. (bnc #388810, bnc #450273) +- revision 11954 +- version 5.25.0 (23) + +------------------------------------------------------------------- Thu Dec 18 13:02:27 CET 2008 - ma(a)suse.de - Add Package::filelist, faster and less memory consuming Modified: trunk/libzypp/zypp/target/TargetCallbackReceiver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetCallba… ============================================================================== --- trunk/libzypp/zypp/target/TargetCallbackReceiver.cc (original) +++ trunk/libzypp/zypp/target/TargetCallbackReceiver.cc Thu Dec 18 22:32:18 2008 @@ -72,6 +72,7 @@ case rpm::InstallResolvableReport::RETRY: return rpm::RpmInstallReport::RETRY; case rpm::InstallResolvableReport::ABORT: + _abort = true; return rpm::RpmInstallReport::ABORT; case rpm::InstallResolvableReport::IGNORE: return rpm::RpmInstallReport::IGNORE; @@ -125,6 +126,7 @@ void RpmRemovePackageReceiver::start( const std::string & name ) { _report->start( _resolvable ); + _abort = false; } /** @@ -150,6 +152,7 @@ case rpm::RemoveResolvableReport::RETRY: return rpm::RpmRemoveReport::RETRY; case rpm::RemoveResolvableReport::ABORT: + _abort = true; return rpm::RpmRemoveReport::ABORT; case rpm::RemoveResolvableReport::IGNORE: return rpm::RpmRemoveReport::IGNORE; Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Thu Dec 18 22:32:18 2008 @@ -616,6 +616,11 @@ MIL << "Target loaded: " << system.solvablesSize() << " resolvables" << endl; } + /////////////////////////////////////////////////////////////////// + // + // COMMIT + // + /////////////////////////////////////////////////////////////////// ZYppCommitResult TargetImpl::commit( ResPool pool_r, const ZYppCommitPolicy & policy_rX ) { // ----------------------------------------------------------------- // @@ -702,7 +707,7 @@ /////////////////////////////////////////////////////////////////// // Remove/install packages. /////////////////////////////////////////////////////////////////// - commit (to_uninstall, policy_r, pool_r ); + commit ( to_uninstall, policy_r, pool_r ); if (policy_r.restrictToMedia() == 0) { // commit all @@ -765,6 +770,11 @@ } + /////////////////////////////////////////////////////////////////// + // + // COMMIT internal + // + /////////////////////////////////////////////////////////////////// TargetImpl::PoolItemList TargetImpl::commit( const TargetImpl::PoolItemList & items_r, const ZYppCommitPolicy & policy_r, @@ -794,6 +804,12 @@ { localfile = packageCache.get( it ); } + catch ( const AbortRequestException &e ) + { + WAR << "commit aborted by the user" << endl; + abort = true; + break; + } catch ( const SkipRequestException &e ) { ZYPP_CAUGHT( e ); @@ -812,8 +828,9 @@ #warning Exception handling // create a installation progress report proxy RpmInstallPackageReceiver progress( it->resolvable() ); - progress.connect(); - bool success = true; + progress.connect(); // disconnected on destruction. + + bool success = false; rpm::RpmInstFlags flags; // Why force and nodeps? // @@ -839,27 +856,34 @@ if ( progress.aborted() ) { WAR << "commit aborted by the user" << endl; - progress.disconnect(); - success = false; abort = true; break; } + else + { + success = true; + } } - catch (Exception & excpt_r) + catch ( Exception & excpt_r ) { ZYPP_CAUGHT(excpt_r); if ( policy_r.dryRun() ) { WAR << "dry run failed" << endl; - progress.disconnect(); break; } // else - WAR << "Install failed" << endl; + if ( progress.aborted() ) + { + WAR << "commit aborted by the user" << endl; + abort = true; + } + else + { + WAR << "Install failed" << endl; + } remaining.push_back( *it ); - progress.disconnect(); - success = false; - break; + break; // stop } if ( success && !policy_r.dryRun() ) @@ -868,14 +892,13 @@ // Remember to check this package for presence of patch scripts. successfullyInstalledPackages.push_back( it->satSolvable() ); } - progress.disconnect(); } else { - bool success = true; - RpmRemovePackageReceiver progress( it->resolvable() ); - progress.connect(); + progress.connect(); // disconnected on destruction. + + bool success = false; rpm::RpmInstFlags flags( rpm::RPMINST_NODEPS ); if (policy_r.dryRun()) flags |= rpm::RPMINST_TEST; try @@ -886,24 +909,30 @@ if ( progress.aborted() ) { WAR << "commit aborted by the user" << endl; - progress.disconnect(); - success = false; abort = true; break; } + else + { + success = true; + } } catch (Exception & excpt_r) { - WAR << "removal of " << p << " failed"; - success = false; ZYPP_CAUGHT( excpt_r ); + if ( progress.aborted() ) + { + WAR << "commit aborted by the user" << endl; + abort = true; + break; + } + // else + WAR << "removal of " << p << " failed"; } - if (success - && !policy_r.dryRun()) + if ( success && !policy_r.dryRun() ) { it->status().resetTransact( ResStatus::USER ); } - progress.disconnect(); } } else if ( ! policy_r.dryRun() ) // other resolvables (non-Package) -- 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] r11953 - /trunk/libzypp/devel/devel.ma/CommitCb.cc
by mlandres＠svn.opensuse.org 18 Dec '08

18 Dec '08

Author: mlandres Date: Thu Dec 18 22:04:34 2008 New Revision: 11953 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11953&view=rev Log: backup Added: trunk/libzypp/devel/devel.ma/CommitCb.cc Added: trunk/libzypp/devel/devel.ma/CommitCb.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/CommitCb.… ============================================================================== --- trunk/libzypp/devel/devel.ma/CommitCb.cc (added) +++ trunk/libzypp/devel/devel.ma/CommitCb.cc Thu Dec 18 22:04:34 2008 @@ -0,0 +1,164 @@ +#include "Tools.h" +#include <zypp/ResObjects.h> + +#include <zypp/sat/LookupAttr.h> +#include <zypp/PoolQuery.h> +#include <zypp/ZYppCallbacks.h> + +struct IRR : public zypp::callback::ReceiveReport<zypp::target::rpm::InstallResolvableReport> +{ + IRR() + { connect(); } +#if 0 + enum Action { + ABORT, // abort and return error + RETRY, // retry + IGNORE // ignore the failure + }; + + enum Error { + NO_ERROR, + NOT_FOUND, // the requested Url was not found + IO, // IO error + INVALID // th resolvable is invalid + }; + + // the level of RPM pushing + /** \deprecated We fortunately no longer do 3 attempts. */ + enum RpmLevel { + RPM, + RPM_NODEPS, + RPM_NODEPS_FORCE + }; +#endif + + virtual void reportbegin() + { SEC << endl; } + virtual void reportend() + { SEC << endl; } + + virtual void start(Resolvable::constPtr /*resolvable*/) + { INT << endl; } + + virtual bool progress(int /*value*/, Resolvable::constPtr /*resolvable*/) + { + static int i = 4; + if ( --i <= 0 ) + { + INT << "return abort" << endl; + return false; + } + return true; + } + + virtual Action problem(Resolvable::constPtr /*resolvable*/, Error /*error*/, const std::string &/*description*/, RpmLevel /*level*/) + { + INT << "return abort" << endl; + return ABORT; + } + + virtual void finish(Resolvable::constPtr /*resolvable*/, Error /*error*/, const std::string &/*reason*/, RpmLevel /*level*/) + { INT << endl; } +}; + +struct RRR : public zypp::callback::ReceiveReport<zypp::target::rpm::RemoveResolvableReport> +{ + RRR() + { connect(); } +#if 0 + enum Action { + ABORT, // abort and return error + RETRY, // retry + IGNORE // ignore the failure + }; + + enum Error { + NO_ERROR, + NOT_FOUND, // the requested Url was not found + IO, // IO error + INVALID // th resolvable is invalid + }; +#endif + + virtual void reportbegin() + { SEC << endl; } + virtual void reportend() + { SEC << endl; } + + virtual void start( Resolvable::constPtr /*resolvable*/ ) + { INT << endl; } + + virtual bool progress(int /*value*/, Resolvable::constPtr /*resolvable*/) + { INT << endl; return true; } + + virtual Action problem( Resolvable::constPtr /*resolvable*/ , Error /*error*/ , const std::string &/*description*/ ) + { INT << endl; return ABORT; } + + virtual void finish( Resolvable::constPtr /*resolvable*/ , Error /*error*/ , const std::string &/*reason*/ ) + { INT << endl; } +}; + +bool solve() +{ + static unsigned run = 0; + USR << "Solve " << run++ << endl; + bool rres = false; + { + zypp::base::LogControl::TmpLineWriter shutUp; + rres = getZYpp()->resolver()->resolvePool(); + } + if ( ! rres ) + { + ERR << "resolve " << rres << endl; + getZYpp()->resolver()->problems(); + return false; + } + return true; +} + +bool install() +{ + ZYppCommitPolicy pol; +//pol.dryRun(true); + pol.rpmInstFlags( pol.rpmInstFlags().setFlag( target::rpm::RPMINST_JUSTDB ) ); + SEC << "START commit..." << endl; + SEC << getZYpp()->commit( pol ) << endl; + return true; +} + +/****************************************************************** +** +** FUNCTION NAME : main +** FUNCTION TYPE : int +*/ +int main( int argc, char * argv[] ) +{ + INT << "===[START]==========================================" << endl; + IRR _irr; + RRR _rrr; + Pathname mroot( "/tmp/ToolScanRepos" ); + TestSetup test( mroot, Arch_i586 ); + test.loadTarget(); + test.loadRepos(); + + ResPool pool( test.pool() ); + ui::Selectable::Ptr sel; + + getSel<Package>( "rpm" )->setToInstall(); + vdumpPoolStats( USR << "Selected:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + + if ( solve() ) + { + vdumpPoolStats( USR << "Solved:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + + install(); + } + + INT << "===[END]============================================" << endl << endl; + return 0; +} + -- 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] r11952 - /branches/SuSE-Linux-11_0-Branch/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution
by schubi2＠svn.opensuse.org 18 Dec '08

18 Dec '08

Author: schubi2 Date: Thu Dec 18 17:02:45 2008 New Revision: 11952 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11952&view=rev Log: regarding packages instead of provides while checking patches Modified: branches/SuSE-Linux-11_0-Branch/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution Modified: branches/SuSE-Linux-11_0-Branch/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution Thu Dec 18 17:02:45 2008 @@ -1,6 +1,6 @@ >!> rpm-2186-0 from channel patch IS NOT SATISFIED >!> UB_s_(1417)patch:rpm-2186-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1418)patch:kernel-debug-2393-0-11.0.noarch(patch) IS BROKEN +>!> US_s_(1418)patch:kernel-debug-2393-0-11.0.noarch(patch) IS SATISFIED >!> UB_s_(1419)patch:java-1_4_2-sun-2426-0-11.0.noarch(patch) IS BROKEN >!> US_s_(1420)patch:openssl-2175-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1421)patch:openssl-devel-32bit-2141-0-11.0.noarch(patch) IS SATISFIED @@ -38,9 +38,9 @@ >!> US_s_(1471)patch:postgresql-server-2276-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1472)patch:timezone-2623-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1473)patch:timezone-2313-0-11.0.noarch(patch) IS SATISFIED ->!> UB_s_(1474)patch:kernel-1900-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1475)patch:kernel-xen-2605-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1476)patch:kernel-xen-2096-0-11.0.noarch(patch) IS BROKEN +>!> US_s_(1474)patch:kernel-1900-0-11.0.noarch(patch) IS SATISFIED +>!> US_s_(1475)patch:kernel-xen-2605-0-11.0.noarch(patch) IS SATISFIED +>!> US_s_(1476)patch:kernel-xen-2096-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1477)patch:jasper-3139-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1479)patch:freetype2-3067-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1480)patch:freetype2-devel-32bit-1918-0-11.0.noarch(patch) IS SATISFIED @@ -49,7 +49,6 @@ >!> US_s_(1486)patch:module-init-tools-1935-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1487)patch:module-init-tools-2234-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1493)patch:texinfo-2263-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1494)patch:yast2-mail-server-2126-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1495)patch:krb5-2440-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1496)patch:krb5-server-3046-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1497)patch:libgsf-2363-0-11.0.noarch(patch) IS SATISFIED @@ -61,7 +60,7 @@ >!> US_s_(1504)patch:xorg-x11-server-2062-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1505)patch:xorg-x11-server-1913-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1506)patch:xorg-x11-server-2449-0-11.0.noarch(patch) IS SATISFIED ->!> UB_s_(1507)patch:xorg-x11-server-3083-0-11.0.noarch(patch) IS BROKEN +>!> US_s_(1507)patch:xorg-x11-server-3083-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1508)patch:xorg-x11-server-1850-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1510)patch:libsoup-2501-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1511)patch:xpdf-tools-2474-0-11.0.noarch(patch) IS SATISFIED @@ -109,18 +108,12 @@ >!> US_s_(1576)patch:libtiff-1908-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1578)patch:xscreensaver-3241-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1580)patch:pwdutils-1912-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1583)patch:libmusicbrainz-2042-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1585)patch:poppler-2589-0-11.0.noarch(patch) IS SATISFIED ->!> UB_s_(1588)patch:qt-2187-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1589)patch:qt-32bit-3047-0-11.0.noarch(patch) IS BROKEN >!> US_s_(1591)patch:python-2167-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1592)patch:sysvinit-2259-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1593)patch:glibc-2113-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1594)patch:Mesa-2177-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1595)patch:yast2-samba-client-2223-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1596)patch:gpg-1959-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1597)patch:gpg-2355-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1598)patch:gpg-2994-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1599)patch:spamassassin-3078-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1600)patch:spamassassin-2521-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1601)patch:openssh-2184-0-11.0.noarch(patch) IS SATISFIED -- 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] r11951 - /trunk/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution
by schubi2＠svn.opensuse.org 18 Dec '08

18 Dec '08

Author: schubi2 Date: Thu Dec 18 16:58:52 2008 New Revision: 11951 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11951&view=rev Log: regarding packages instead of provides while checking patches Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/patch-tests/patch-test.solution Thu Dec 18 16:58:52 2008 @@ -1,6 +1,6 @@ >!> rpm-2186-0 from channel patch IS NOT SATISFIED >!> UB_s_(1417)patch:rpm-2186-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1418)patch:kernel-debug-2393-0-11.0.noarch(patch) IS BROKEN +>!> US_s_(1418)patch:kernel-debug-2393-0-11.0.noarch(patch) IS SATISFIED >!> UB_s_(1419)patch:java-1_4_2-sun-2426-0-11.0.noarch(patch) IS BROKEN >!> US_s_(1420)patch:openssl-2175-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1421)patch:openssl-devel-32bit-2141-0-11.0.noarch(patch) IS SATISFIED @@ -38,9 +38,9 @@ >!> US_s_(1471)patch:postgresql-server-2276-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1472)patch:timezone-2623-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1473)patch:timezone-2313-0-11.0.noarch(patch) IS SATISFIED ->!> UB_s_(1474)patch:kernel-1900-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1475)patch:kernel-xen-2605-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1476)patch:kernel-xen-2096-0-11.0.noarch(patch) IS BROKEN +>!> US_s_(1474)patch:kernel-1900-0-11.0.noarch(patch) IS SATISFIED +>!> US_s_(1475)patch:kernel-xen-2605-0-11.0.noarch(patch) IS SATISFIED +>!> US_s_(1476)patch:kernel-xen-2096-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1477)patch:jasper-3139-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1479)patch:freetype2-3067-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1480)patch:freetype2-devel-32bit-1918-0-11.0.noarch(patch) IS SATISFIED @@ -49,7 +49,6 @@ >!> US_s_(1486)patch:module-init-tools-1935-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1487)patch:module-init-tools-2234-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1493)patch:texinfo-2263-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1494)patch:yast2-mail-server-2126-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1495)patch:krb5-2440-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1496)patch:krb5-server-3046-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1497)patch:libgsf-2363-0-11.0.noarch(patch) IS SATISFIED @@ -61,7 +60,7 @@ >!> US_s_(1504)patch:xorg-x11-server-2062-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1505)patch:xorg-x11-server-1913-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1506)patch:xorg-x11-server-2449-0-11.0.noarch(patch) IS SATISFIED ->!> UB_s_(1507)patch:xorg-x11-server-3083-0-11.0.noarch(patch) IS BROKEN +>!> US_s_(1507)patch:xorg-x11-server-3083-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1508)patch:xorg-x11-server-1850-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1510)patch:libsoup-2501-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1511)patch:xpdf-tools-2474-0-11.0.noarch(patch) IS SATISFIED @@ -109,18 +108,12 @@ >!> US_s_(1576)patch:libtiff-1908-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1578)patch:xscreensaver-3241-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1580)patch:pwdutils-1912-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1583)patch:libmusicbrainz-2042-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1585)patch:poppler-2589-0-11.0.noarch(patch) IS SATISFIED ->!> UB_s_(1588)patch:qt-2187-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1589)patch:qt-32bit-3047-0-11.0.noarch(patch) IS BROKEN >!> US_s_(1591)patch:python-2167-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1592)patch:sysvinit-2259-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1593)patch:glibc-2113-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1594)patch:Mesa-2177-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1595)patch:yast2-samba-client-2223-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1596)patch:gpg-1959-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1597)patch:gpg-2355-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1598)patch:gpg-2994-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1599)patch:spamassassin-3078-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1600)patch:spamassassin-2521-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1601)patch:openssh-2184-0-11.0.noarch(patch) IS SATISFIED -- 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] r11950 - /trunk/libzypp/zypp/Package.h
by mlandres＠svn.opensuse.org 18 Dec '08

18 Dec '08

Author: mlandres Date: Thu Dec 18 13:12:40 2008 New Revision: 11950 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11950&view=rev Log: typo Modified: trunk/libzypp/zypp/Package.h Modified: trunk/libzypp/zypp/Package.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Package.h?rev=11950… ============================================================================== --- trunk/libzypp/zypp/Package.h (original) +++ trunk/libzypp/zypp/Package.h Thu Dec 18 13:12:40 2008 @@ -85,7 +85,7 @@ * consume much memory. */ FileList filelist() const; - /** \deprecated Use filelist, it's faster and saves memeory. */ + /** \deprecated Use filelist, it's faster and saves memory. */ std::list<std::string> filenames() const ZYPP_DEPRECATED; /** Name of the source rpm this package was built from. -- 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] r11949 - in /trunk/libzypp: devel/devel.ma/Test.cc package/libzypp.changes zypp/Package.cc zypp/Package.h zypp/sat/LookupAttrTools.h
by mlandres＠svn.opensuse.org 18 Dec '08

18 Dec '08

Author: mlandres Date: Thu Dec 18 13:05:46 2008 New Revision: 11949 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11949&view=rev Log: - Add Package::filelist, faster and less memory consuming implementation of Package::filenames (now deprecated). Modified: trunk/libzypp/devel/devel.ma/Test.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Package.cc trunk/libzypp/zypp/Package.h trunk/libzypp/zypp/sat/LookupAttrTools.h Modified: trunk/libzypp/devel/devel.ma/Test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Test.cc?r… ============================================================================== --- trunk/libzypp/devel/devel.ma/Test.cc (original) +++ trunk/libzypp/devel/devel.ma/Test.cc Thu Dec 18 13:05:46 2008 @@ -2,23 +2,45 @@ #include <zypp/ResObjects.h> #include <zypp/sat/LookupAttr.h> +#include <zypp/PoolQuery.h> - static std::string pidAndAppname() +static std::string pidAndAppname() +{ + static std::string _val; + if ( _val.empty() ) { - static std::string _val; - if ( _val.empty() ) - { - pid_t mypid = getpid(); - Pathname p( "/proc/"+str::numstring(mypid)+"/exe" ); - Pathname myname( filesystem::readlink( p ) ); - - _val += str::numstring(mypid); - _val += ":"; - _val += myname.basename(); - } - return _val; + pid_t mypid = getpid(); + Pathname p( "/proc/"+str::numstring(mypid)+"/exe" ); + Pathname myname( filesystem::readlink( p ) ); + + _val += str::numstring(mypid); + _val += ":"; + _val += myname.basename(); + } + return _val; +} + +bool solve() +{ + static unsigned run = 0; + USR << "Solve " << run++ << endl; + bool rres = false; + { + zypp::base::LogControl::TmpLineWriter shutUp; + rres = getZYpp()->resolver()->resolvePool(); + } + if ( ! rres ) + { + ERR << "resolve " << rres << endl; + getZYpp()->resolver()->problems(); + return false; } + return true; +} + +typedef sat::ArrayAttr<std::string,std::string> FileList; + /****************************************************************** ** ** FUNCTION NAME : main @@ -28,37 +50,60 @@ { INT << "===[START]==========================================" << endl; - SEC << pidAndAppname() << endl; - - - INT << "===[END]============================================" << endl << endl; - return 0; - Pathname mroot( "/tmp/Bb" ); + Pathname mroot( "/tmp/ToolScanRepos" ); TestSetup test( mroot, Arch_x86_64 ); - test.loadRepo( "/Local/ROOT/cache/raw/11.1-update" ); - test.loadRepo( "/Local/ROOT/cache/raw/11.0-update" ); + test.loadRepo("/Local/ROOT/cache/solv/@System/solv"); - sat::Pool satpool( test.satpool() ); - for_( it, satpool.reposBegin(), satpool.reposEnd() ) + ResPool pool( test.pool() ); + { + Measure x("filelist"); + unsigned p = 0; + unsigned f = 0; + std::string a; + for_( it, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ) + { + ++p; + f += (*it)->asKind<Package>()->filelist().size(); + for_( i, (*it)->asKind<Package>()->filelist().begin(), (*it)->asKind<Package>()->filelist().end() ) + a = *i; + } + SEC << p << " : " << f << endl; + } { - MIL << *it << endl; - DBG << it->generatedTimestamp() << endl; - DBG << it->suggestedExpirationTimestamp() << endl; + Measure x("filenames"); + unsigned p = 0; + unsigned f = 0; + std::string a; + for_( it, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ) + { + ++p; + std::list<std::string> l( (*it)->asKind<Package>()->filenames() ); + f += l.size(); + for_( i, l.begin(), l.end() ) + a = *i; + } + SEC << p << " : " << f << endl; } INT << "===[END]============================================" << endl << endl; return 0; - sat::LookupRepoAttr q( sat::SolvAttr::repositoryAddedFileProvides ); - USR << q << endl; - USR << dump(q) << endl; - for_( it, q.begin(), q.end() ) - { - MIL << it << endl; - } + //ui::Selectable::Ptr getSel( const std::string & name_r ) + getSel<Package>( "gcompris" )->setToInstall(); + vdumpPoolStats( USR << "Transacting:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + + if ( solve() ) + { + vdumpPoolStats( USR << "Transacting:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + SEC << getSel<Package>( "librsvg" ) << endl; + } INT << "===[END]============================================" << endl << endl; return 0; } Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Dec 18 13:05:46 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Dec 18 13:02:27 CET 2008 - ma(a)suse.de + +- Add Package::filelist, faster and less memory consuming + implementation of Package::filenames (now deprecated). +- revision 11949 + +------------------------------------------------------------------- Thu Dec 11 21:39:50 CET 2008 - ma(a)suse.de - Add str::hexencode and str::hexdecode to encode special characters Modified: trunk/libzypp/zypp/Package.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Package.cc?rev=1194… ============================================================================== --- trunk/libzypp/zypp/Package.cc (original) +++ trunk/libzypp/zypp/Package.cc Thu Dec 18 13:05:46 2008 @@ -122,15 +122,13 @@ return ret; } + Package::FileList Package::filelist() const + { return FileList( sat::SolvAttr::filelist, satSolvable() ); } + std::list<std::string> Package::filenames() const { - std::list<std::string> files; - sat::LookupAttr q( sat::SolvAttr::filelist, *this ); - for_( it, q.begin(), q.end() ) - { - files.push_back(it.asString()); - } - return files; + FileList f( filelist() ); + return std::list<std::string>( f.begin(), f.end() ); } CheckSum Package::checksum() const Modified: trunk/libzypp/zypp/Package.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Package.h?rev=11949… ============================================================================== --- trunk/libzypp/zypp/Package.h (original) +++ trunk/libzypp/zypp/Package.h Thu Dec 18 13:05:46 2008 @@ -39,13 +39,14 @@ public: typedef sat::ArrayAttr<PackageKeyword,IdString> Keywords; + typedef sat::ArrayAttr<std::string,std::string> FileList; public: /** * Returns the level of supportability the vendor * gives to this package. - * + * * This is one value from \ref VendorSupportOption */ VendorSupportOption vendorSupport() const; @@ -77,8 +78,15 @@ ByteCount sourcesize() const; /** */ std::list<std::string> authors() const; - /** */ - std::list<std::string> filenames() const; + + /** Return the packages filelist (if available). + * The returned \ref FileList appears to be a container of + * \c std::string. In fact it is a query, so it does not + * consume much memory. + */ + FileList filelist() const; + /** \deprecated Use filelist, it's faster and saves memeory. */ + std::list<std::string> filenames() const ZYPP_DEPRECATED; /** Name of the source rpm this package was built from. */ Modified: trunk/libzypp/zypp/sat/LookupAttrTools.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/LookupAttrTools… ============================================================================== --- trunk/libzypp/zypp/sat/LookupAttrTools.h (original) +++ trunk/libzypp/zypp/sat/LookupAttrTools.h Thu Dec 18 13:05:46 2008 @@ -172,7 +172,8 @@ {} public: - typedef sat::LookupAttr::transformIterator<_ResultT,_AttrT> iterator; + typedef LookupAttr::transformIterator<_ResultT,_AttrT> iterator; + typedef LookupAttr::size_type size_type; iterator begin() const { return iterator( _q.begin() ); } @@ -183,6 +184,14 @@ bool empty() const { return _q.empty(); } + size_type size() const + { + size_type count = 0; + for_( it, begin(), end() ) + ++count; + return count; + } + public: iterator find( const _ResultT & key_r ) const -- 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] r11948 - /branches/SuSE-Linux-11_0-Branch/sat-solver/src/pool.c
by mlschroe＠svn.opensuse.org 18 Dec '08

18 Dec '08

Author: mlschroe Date: Thu Dec 18 12:19:51 2008 New Revision: 11948 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11948&view=rev Log: - handle patch conflicts different also in trivial_installable (bnc#447986) Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/pool.c Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-so… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/src/pool.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/src/pool.c Thu Dec 18 12:19:51 2008 @@ -1338,7 +1338,7 @@ return dep; } -static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep) +static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep, int ispatch) { Id p, *pp; int r = 0; @@ -1346,6 +1346,8 @@ { if (p == SYSTEMSOLVABLE) return 1; /* always boring, as never constraining */ + if (ispatch && !pool_match_nevr(pool, pool->solvables + p, dep)) + continue; if ((map[p] & 9) == 9) return 9; r |= map[p] & 17; @@ -1413,7 +1415,7 @@ { if (req == SOLVABLE_PREREQMARKER) continue; - r = providedbyinstalled(pool, map, req); + r = providedbyinstalled(pool, map, req, 0); if (!r) { /* decided and miss */ @@ -1429,10 +1431,14 @@ } if (s->conflicts) { + int ispatch = 0; + + if (!strncmp("patch:", id2str(pool, s->name), 6)) + ispatch = 1; conp = s->repo->idarraydata + s->conflicts; while ((con = *conp++) != 0) { - if ((providedbyinstalled(pool, map, con) & 1) != 0) + if ((providedbyinstalled(pool, map, con, ispatch) & 1) != 0) { map[p] = 2; break; @@ -1440,7 +1446,7 @@ if ((m == 1 || m == 17) && ISRELDEP(con)) { con = dep2name(pool, con); - if ((providedbyinstalled(pool, map, con) & 1) != 0) + if ((providedbyinstalled(pool, map, con, ispatch) & 1) != 0) m = 9; } } @@ -1457,7 +1463,7 @@ obsp = s->repo->idarraydata + s->obsoletes; while ((obs = *obsp++) != 0) { - if ((providedbyinstalled(pool, map, obs) & 1) != 0) + if ((providedbyinstalled(pool, map, obs, 0) & 1) != 0) { map[p] = 2; break; -- 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] r11947 - /trunk/sat-solver/src/pool.c
by mlschroe＠svn.opensuse.org 18 Dec '08

18 Dec '08

Author: mlschroe Date: Thu Dec 18 12:17:46 2008 New Revision: 11947 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11947&view=rev Log: - handle patch conflicts different also in trivial_installable Modified: trunk/sat-solver/src/pool.c Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=11947&… ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Thu Dec 18 12:17:46 2008 @@ -1387,7 +1387,7 @@ return dep; } -static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep) +static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep, int ispatch) { Id p, pp; int r = 0; @@ -1395,6 +1395,8 @@ { if (p == SYSTEMSOLVABLE) return 1; /* always boring, as never constraining */ + if (ispatch && !pool_match_nevr(pool, pool->solvables + p, dep)) + continue; if ((map[p] & 9) == 9) return 9; r |= map[p] & 17; @@ -1462,7 +1464,7 @@ { if (req == SOLVABLE_PREREQMARKER) continue; - r = providedbyinstalled(pool, map, req); + r = providedbyinstalled(pool, map, req, 0); if (!r) { /* decided and miss */ @@ -1478,10 +1480,14 @@ } if (s->conflicts) { + int ispatch = 0; /* see solver.c patch handling */ + + if (!strncmp("patch:", id2str(pool, s->name), 6)) + ispatch = 1; conp = s->repo->idarraydata + s->conflicts; while ((con = *conp++) != 0) { - if ((providedbyinstalled(pool, map, con) & 1) != 0) + if ((providedbyinstalled(pool, map, con, ispatch) & 1) != 0) { map[p] = 2; break; @@ -1489,7 +1495,7 @@ if ((m == 1 || m == 17) && ISRELDEP(con)) { con = dep2name(pool, con); - if ((providedbyinstalled(pool, map, con) & 1) != 0) + if ((providedbyinstalled(pool, map, con, ispatch) & 1) != 0) m = 9; } } @@ -1506,7 +1512,7 @@ obsp = s->repo->idarraydata + s->obsoletes; while ((obs = *obsp++) != 0) { - if ((providedbyinstalled(pool, map, obs) & 1) != 0) + if ((providedbyinstalled(pool, map, obs, 0) & 1) != 0) { map[p] = 2; break; -- 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] r11946 - in /trunk/sat-solver: CMakeLists.txt tools/repo_rpmdb.c
by mlschroe＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: mlschroe Date: Wed Dec 17 19:06:30 2008 New Revision: 11946 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11946&view=rev Log: - fix fedora builds (bnc#444211) (cmake needs to be called with -DFEDORA:=1) Modified: trunk/sat-solver/CMakeLists.txt trunk/sat-solver/tools/repo_rpmdb.c Modified: trunk/sat-solver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=11… ============================================================================== --- trunk/sat-solver/CMakeLists.txt (original) +++ trunk/sat-solver/CMakeLists.txt Wed Dec 17 19:06:30 2008 @@ -35,7 +35,13 @@ FIND_PACKAGE(Check REQUIRED) FIND_PACKAGE(ZLIB REQUIRED) +IF ( FEDORA ) +MESSAGE(STATUS "Building for Fedora") +ADD_DEFINITIONS( -DFEDORA ) +FIND_LIBRARY(RPMDB_LIBRARY NAMES rpm) +ELSE ( FEDORA ) FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb) +ENDIF ( FEDORA) SET( PACKAGE "satsolver" ) SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" ) Modified: trunk/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.c (original) +++ trunk/sat-solver/tools/repo_rpmdb.c Wed Dec 17 19:06:30 2008 @@ -22,7 +22,11 @@ #include <unistd.h> #include <assert.h> +#ifdef FEDORA +#include <db4/db.h> +#else #include <rpm/db.h> +#endif #include "pool.h" #include "repo.h" @@ -1274,7 +1278,12 @@ exit(1); } snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm", rootdir); + /* should look in /usr/lib/rpm/macros instead, but we want speed... */ +#ifdef FEDORA + if (dbenv->open(dbenv, dbpath, DB_CREATE|DB_INIT_CDB|DB_INIT_MPOOL, 0)) +#else if (dbenv->open(dbenv, dbpath, DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL, 0)) +#endif { perror("dbenv open"); exit(1); -- 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] r11945 - in /trunk/libzypp-bindings: CMakeLists.txt package/libzypp-bindings.changes
by mlandres＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: mlandres Date: Wed Dec 17 14:14:04 2008 New Revision: 11945 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11945&view=rev Log: changes Modified: trunk/libzypp-bindings/CMakeLists.txt trunk/libzypp-bindings/package/libzypp-bindings.changes Modified: trunk/libzypp-bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/CMakeLists.txt?… ============================================================================== --- trunk/libzypp-bindings/CMakeLists.txt (original) +++ trunk/libzypp-bindings/CMakeLists.txt Wed Dec 17 14:14:04 2008 @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.6) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fno-strict-aliasing") # # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked Modified: trunk/libzypp-bindings/package/libzypp-bindings.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/package/libzypp… ============================================================================== --- trunk/libzypp-bindings/package/libzypp-bindings.changes (original) +++ trunk/libzypp-bindings/package/libzypp-bindings.changes Wed Dec 17 14:14:04 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 17 14:11:42 CET 2008 - ma(a)suse.de + +- Compile with -fPIC +- revision 11945 + +------------------------------------------------------------------- Tue Nov 11 15:21:28 CET 2008 - ma(a)suse.de - Ignore Pathname operator<. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0