back to rev 9977

diff --git a/zypp/solver/detail/ResolverUpgrade.cc b/zypp/solver/detail/ResolverUpgrade.cc
index 0e7b9ea..5c4dc11 100644 (file)
--- a/zypp/solver/detail/ResolverUpgrade.cc
+++ b/zypp/solver/detail/ResolverUpgrade.cc
@@ -216,8 +216,6 @@ Resolver::doUpgrade( UpgradeStatistics & opt_stats_r )
   TodoMap     addProvided;
   TodoMap     addMultiProvided;
 
-  PoolItemSet obsoletedItems;
-
   Target_Ptr target;
   try {
        target = getZYpp()->target();
@@ -558,7 +556,6 @@ Resolver::doUpgrade( UpgradeStatistics & opt_stats_r )
       if ( doesObsoleteItem (provider, it->first ) ) {
        it->first.status().setToBeUninstalled( ResStatus::APPL_HIGH );
       }
-      obsoletedItems.insert (it->first);
     }
 
   }
@@ -582,7 +579,6 @@ Resolver::doUpgrade( UpgradeStatistics & opt_stats_r )
            if ( ! doesObsoleteItem (item, it->first ) ) {
                it->first.status().setToBeUninstalled( ResStatus::APPL_HIGH );
            }
-           obsoletedItems.insert (it->first);      
            guess = PoolItem();
            break;
        } else {
@@ -613,7 +609,6 @@ Resolver::doUpgrade( UpgradeStatistics & opt_stats_r )
                    if ( ! doesObsoleteItem (item, it->first ) ) {
                        it->first.status().setToBeUninstalled( ResStatus::APPL_HIGH );
                    }
-                   obsoletedItems.insert (it->first);                      
                    guess = PoolItem();
                    break;
                } else {
@@ -634,7 +629,6 @@ Resolver::doUpgrade( UpgradeStatistics & opt_stats_r )
       if ( ! doesObsoleteItem (guess, it->first ) ) {
        it->first.status().setToBeUninstalled( ResStatus::APPL_HIGH );
       }
-      obsoletedItems.insert (it->first);                 
       ++opt_stats_r.chk_replaced_guessed;
     }
   }
@@ -650,32 +644,8 @@ Resolver::doUpgrade( UpgradeStatistics & opt_stats_r )
   // Unmaintained packages which does not fit to the updated system
   // (broken dependencies) will be deleted.
   // Make a solverrun and return it to the calling function
+  return checkUnmaintainedItems ();  
   
-  bool ret=checkUnmaintainedItems ();
-  
-  // Packages which obsoletes other installed packages will be installed if
-  // no other package obsoletes AND provides the other package too.
-  for ( ResPool::const_iterator it = _pool.begin(); it != _pool.end(); ++it ) {
-      PoolItem item = *it;
-      if (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);
-             for_( provIter, possibleProviders.begin(), possibleProviders.end() ) {
-                 PoolItem provider = ResPool::instance().find( *provIter );
-                 if (provider.status().isInstalled()
-                     && !provider.status().isToBeUninstalled()
-                     && obsoletedItems.find(provider) == obsoletedItems.end()) {
-                     MIL << item << " obsoletes " << provider << " but do not provides it. --> replace it" << endl;
-                     it->status().setToBeInstalled( ResStatus::APPL_HIGH );
-                     obsoletedItems.insert (provider);                           
-                 }     
-             }
-         }
-      }
-  }
-
-  return ret;
 }