move check of installed items to distupgrade

diff --git a/zypp/sat/SATResolver.cc b/zypp/sat/SATResolver.cc
index 74d057c7935a942bde712f7e4d49c9a2d8e99350..ed45b962a65f20f62790fa7e8f35b26e6e59b2c9 100644 (file)
--- a/zypp/sat/SATResolver.cc
+++ b/zypp/sat/SATResolver.cc
@@ -229,18 +229,15 @@ SATSolutionToPool (PoolItem item, const ResStatus & status, const ResStatus::Tra
 
 
 //----------------------------------------------------------------------------
-// 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;
        }

diff --git a/zypp/solver/detail/ResolverUpgrade.cc b/zypp/solver/detail/ResolverUpgrade.cc
index 82833d052e73e946016f5d2ab0f07a298d01b8ad..04b0b7a9f8f76becc547c2af94a471d7c1062a2c 100644 (file)
--- a/zypp/solver/detail/ResolverUpgrade.cc
+++ b/zypp/solver/detail/ResolverUpgrade.cc
@@ -446,7 +446,9 @@ Resolver::doUpgrade( UpgradeStatistics & opt_stats_r )
              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() );