Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2012-06-10 20:18:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2012-06-01 07:21:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2012-06-10 21:51:58.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Jun 8 15:57:22 CEST 2012 - [email protected] + +- Adjust weaklock fix + +------------------------------------------------------------------- +Fri Jun 8 14:16:15 CEST 2012 - [email protected] + +- Fix processing of weak locks (bnc#749418, bnc#765164) +- [valgrind] don't dereference if we may be past the end of the repositories. +- add armv7hl workaround for Adrian +- version 11.6.2 (6) + +------------------------------------------------------------------- +Sun Jun 3 01:14:09 CEST 2012 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-11.6.1.tar.bz2 New: ---- libzypp-11.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.5nHECw/_old 2012-06-10 21:51:59.000000000 +0200 +++ /var/tmp/diff_new_pack.5nHECw/_new 2012-06-10 21:51:59.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 11.6.1 +Version: 11.6.2 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-11.6.1.tar.bz2 -> libzypp-11.6.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.6.1/VERSION.cmake new/libzypp-11.6.2/VERSION.cmake --- old/libzypp-11.6.1/VERSION.cmake 2012-05-31 12:51:42.000000000 +0200 +++ new/libzypp-11.6.2/VERSION.cmake 2012-06-08 16:55:24.000000000 +0200 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "11") SET(LIBZYPP_COMPATMINOR "6") SET(LIBZYPP_MINOR "6") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # -# LAST RELEASED: 11.6.0 (6) +# LAST RELEASED: 11.6.2 (6) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.6.1/package/libzypp.changes new/libzypp-11.6.2/package/libzypp.changes --- old/libzypp-11.6.1/package/libzypp.changes 2012-05-31 12:51:42.000000000 +0200 +++ new/libzypp-11.6.2/package/libzypp.changes 2012-06-08 16:55:24.000000000 +0200 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Fri Jun 8 15:57:22 CEST 2012 - [email protected] + +- Adjust weaklock fix + +------------------------------------------------------------------- +Fri Jun 8 14:16:15 CEST 2012 - [email protected] + +- Fix processing of weak locks (bnc#749418, bnc#765164) +- [valgrind] don't dereference if we may be past the end of the repositories. +- add armv7hl workaround for Adrian +- version 11.6.2 (6) + +------------------------------------------------------------------- +Sun Jun 3 01:14:09 CEST 2012 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Thu May 31 10:07:37 UTC 2012 - [email protected] - fix an invalid read revealed by valgrind in Files old/libzypp-11.6.1/po/zypp-po.tar.bz2 and new/libzypp-11.6.2/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-11.6.1/zypp/solver/detail/SATResolver.cc new/libzypp-11.6.2/zypp/solver/detail/SATResolver.cc --- old/libzypp-11.6.1/zypp/solver/detail/SATResolver.cc 2012-05-31 12:51:42.000000000 +0200 +++ new/libzypp-11.6.2/zypp/solver/detail/SATResolver.cc 2012-06-08 16:55:23.000000000 +0200 @@ -1426,21 +1426,22 @@ } } + /////////////////////////////////////////////////////////////////// + // Weak locks: Ignore if an item with this name is already installed. + // If it's not installed try to keep it this way using a weak delete + /////////////////////////////////////////////////////////////////// std::set<IdString> unifiedByName; for (PoolItemList::const_iterator iter = _items_to_keep.begin(); iter != _items_to_keep.end(); ++iter) { - if (iter->status().isInstalled()) { - MIL << "Keep installed item " << *iter << endl; - queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVER_SOLVABLE | SOLVER_WEAK ); - queue_push( &(_jobQueue), (*iter)->satSolvable().id() ); - } else { - IdString ident( (*iter)->satSolvable().ident() ); - MIL << "Keep NOT installed name " << ident << " (" << *iter << ")" << endl; - if ( unifiedByName.insert( ident ).second ) - { - queue_push( &(_jobQueue), SOLVER_ERASE | SOLVER_SOLVABLE_NAME | SOLVER_WEAK | MAYBE_CLEANDEPS ); - queue_push( &(_jobQueue), ident.id() ); - } + IdString ident( (*iter)->satSolvable().ident() ); + if ( unifiedByName.insert( ident ).second ) + { + if ( ! ui::Selectable::get( *iter )->hasInstalledObj() ) + { + MIL << "Keep NOT installed name " << ident << " (" << *iter << ")" << endl; + queue_push( &(_jobQueue), SOLVER_ERASE | SOLVER_SOLVABLE_NAME | SOLVER_WEAK | MAYBE_CLEANDEPS ); + queue_push( &(_jobQueue), ident.id() ); } + } } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
