Author: mlandres Date: Fri Dec 5 17:43:12 2008 New Revision: 11898 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11898&view=rev Log: - Prune soft locks to prevent installation but not update of already installed packages. Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake?rev=11898&r1=11897&r2=11898&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Fri Dec 5 17:43:12 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "27") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes?rev=11898&r1=11897&r2=11898&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Fri Dec 5 17:43:12 2008 @@ -1,8 +1,16 @@ ------------------------------------------------------------------- +Fri Dec 5 17:38:30 CET 2008 - ma@suse.de + +- Prune soft locks to prevent installation but not update of + already installed packages. (bnc #425054, et al.) +- revision 11898 +- version 4.27.5 + +------------------------------------------------------------------- Mon Oct 27 14:51:59 CET 2008 - ma@suse.de - Rewrote repo2solv.sh call to use execv, getting rid of any need - for argument quoting. (#439058) + for argument quoting. (bnc #439058) - revision 11505 - version 4.27.4 Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc?rev=11898&r1=11897&r2=11898&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc Fri Dec 5 17:43:12 2008 @@ -450,9 +450,14 @@ } } { - const SoftLocksFile::Data & softLocks( _softLocksFile.data() ); + SoftLocksFile::Data softLocks( _softLocksFile.data() ); if ( ! softLocks.empty() ) { + // Don't soft lock any installed item. + for_( it, system.solvablesBegin(), system.solvablesEnd() ) + { + softLocks.erase( it->ident() ); + } ResPool::instance().setAutoSoftLocks( softLocks ); } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org