[zypp-commit] r10506 - /branches/SuSE-Linux-11_0-Branch/libzypp/zypp/solver/detail/ResolverUpgrade.cc
Author: schubi2 Date: Mon Jul 7 13:58:05 2008 New Revision: 10506 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10506&view=rev Log: Do not update an already updated package Bug 400422 Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/solver/detail/ResolverUpgrade.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/solver/detail/ResolverUpgrade.cc?rev=10506&r1=10505&r2=10506&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/solver/detail/ResolverUpgrade.cc Mon Jul 7 13:58:05 2008 @@ -657,7 +657,9 @@ // no other packages obsolete the installed package too. for ( ResPool::const_iterator it = _pool.begin(); it != _pool.end(); ++it ) { PoolItem item = *it; - if (item.status().staysUninstalled()) { + PoolItem installed = Helper::findInstalledItem( _pool, item ); + if (( !installed || compareByNVR (installed.resolvable(), item.resolvable()) != 0) // is not already installed Bug 4000422 + && item.status().staysUninstalled()) { for( Capabilities::const_iterator pit = item->dep( Dep::OBSOLETES ).begin(); pit != item->dep( Dep::OBSOLETES ).end(); ++pit) { // find ALL providers sat::WhatProvides possibleProviders(*pit); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org
participants (1)
-
schubi2@svn.opensuse.org