Author: mlandres Date: Fri Nov 28 16:36:47 2008 New Revision: 11830 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11830&view=rev Log: - Prune soft locks to prevent installation but not update of already installed packages. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11830&r... ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Nov 28 16:36:47 2008 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "3") +SET(LIBZYPP_PATCH "4") # -# LAST RELEASED: 5.24.3 (23) +# LAST RELEASED: 5.24.4 (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?r... ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Nov 28 16:36:47 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 28 16:33:56 CET 2008 - ma@suse.de + +- Prune soft locks to prevent installation but not update of + already installed packages. +- revision 11829 +- version 5.24.4 (23) + +------------------------------------------------------------------- Fri Nov 28 11:36:03 CET 2008 - schubi@suse.de - Taking solutions which based on user requirements/conflict Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.cc... ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Fri Nov 28 16:36:47 2008 @@ -384,7 +384,7 @@ Pathname idpath( home() / "AnonymousUniqueId"); try - { + { updateFileContent( idpath, boost::bind(fileMissing, idpath), generateRandomId ); @@ -393,7 +393,7 @@ { WAR << "Can't create anonymous id file" << endl; } - + } void TargetImpl::createLastDistributionFlavorCache() const @@ -411,10 +411,10 @@ } string flavor = p->flavor(); - + try { - + updateFileContent( flavorpath, // only if flavor is not empty functor::Constant<bool>( ! flavor.empty() ), @@ -588,9 +588,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 ); } } @@ -602,7 +607,7 @@ ResPool::instance().setHardLockQueries( hardLocks ); } } - + // now that the target is loaded, we can cache the flavor createLastDistributionFlavorCache(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org