Author: schubi2 Date: Fri Feb 15 18:02:32 2008 New Revision: 8754 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8754&view=rev Log: move check of installed items to distupgrade Modified: trunk/libzypp/zypp/sat/SATResolver.cc trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?rev=8754&r1=8753&r2=8754&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Fri Feb 15 18:02:32 2008 @@ -229,18 +229,15 @@ //---------------------------------------------------------------------------- -// helper functions for distupgrade +// helper functions for distupgrade and installation order //---------------------------------------------------------------------------- PoolItemList SATResolver::whoProvides(Capability cap) { PoolItemList itemList; Id p, *pp; - Repo *installedRepo = sat::Pool::instance().systemRepo().get(); for (pp = pool_whatprovides(_SATPool, cap.id()) ; (p = *pp++) != 0; ) { - Solvable *solvable = _SATPool->solvables + p; PoolItem item = _pool.find (sat::Solvable(p)); - if (item && - (!installedRepo || solvable->repo != installedRepo) ) { + if (item) { itemList.push_back (item); MIL << item << " provides " << cap << endl; } Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc?rev=8754&r1=8753&r2=8754&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Fri Feb 15 18:02:32 2008 @@ -446,7 +446,9 @@ otherVendorFound = true; } else if ( provider.status().isToBeUninstalled() ) { MIL << " IGNORE relation match (package is tagged to delete): " << provider << endl; - } + } else if ( provider.status().isInstalled() ) { + MIL << " IGNORE relation match (package is tagged to delete): " << provider << endl; + } else { FindMap::iterator it = providersMap.find( provider->name() ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org