Revert "Evaluate a products droplist also if 'dup --from' is performed"

Satsolver does not not support orphan handling outside full DUP. So the
patch is useless. This reverts commit 52cdd347bc3ba6a958f2ff2efd4faf15601aa14a,
52cdd347bc3ba6a958f2ff2efd4faf15601aa14a.

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 8b8942d..1510f96 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -588,7 +588,7 @@ SATResolver::solving(const CapabilitySet & requires_caps,
 
 
 void
-SATResolver::solverInit(const PoolItemList & weakItems, const std::set<Repository> & upgradeRepos)
+SATResolver::solverInit(const PoolItemList & weakItems)
 {
     SATCollectTransact info (*this);
 
@@ -637,7 +637,7 @@ SATResolver::solverInit(const PoolItemList & weakItems, const std::set<Repositor
       }
     }
 
-    if ( _distupgrade || !upgradeRepos.empty() )
+    if ( _distupgrade )
     {
       if ( ZConfig::instance().solverUpgradeRemoveDroppedPackages() )
       {
@@ -649,23 +649,7 @@ SATResolver::solverInit(const PoolItemList & weakItems, const std::set<Repositor
         {
           if ( (*it)->onSystem() ) // (to install) or (not to delete)
           {
-            Product::constPtr prodCand;
-            if ( _distupgrade )
-            {
-              prodCand = (*it)->candidateAsKind<Product>();
-            }
-            else // if ( !upgradeRepos.empty() )
-            {
-              for_( ait, (*it)->availableBegin(), (*it)->availableEnd() )
-              {
-                if ( upgradeRepos.find( (*ait).satSolvable().repository() ) != upgradeRepos.end() )
-                {
-                  prodCand = (*ait)->asKind<Product>();
-                  break;
-                }
-              }
-            }
-
+            Product::constPtr prodCand( (*it)->candidateAsKind<Product>() );
             if ( ! prodCand || (*it)->identicalInstalledCandidate() )
               continue; // product no longer available or unchanged
 
@@ -705,7 +689,7 @@ SATResolver::resolvePool(const CapabilitySet & requires_caps,
     MIL << "SATResolver::resolvePool()" << endl;
 
     // initialize
-    solverInit(weakItems, upgradeRepos);
+    solverInit(weakItems);
 
     for (PoolItemList::const_iterator iter = _items_to_install.begin(); iter != _items_to_install.end(); iter++) {
        Id id = (*iter)->satSolvable().id();

diff --git a/zypp/solver/detail/SATResolver.h b/zypp/solver/detail/SATResolver.h
index 2f6b27a..56140d0 100644 (file)
--- a/zypp/solver/detail/SATResolver.h
+++ b/zypp/solver/detail/SATResolver.h
@@ -104,7 +104,7 @@ class SATResolver : public base::ReferenceCounted, private base::NonCopyable {
     void resetItemTransaction (PoolItem item);
 
     // Create a SAT solver and reset solver selection in the pool (Collecting
-    void solverInit(const PoolItemList & weakItems, const std::set<Repository> & upgradeRepos = std::set<Repository>());
+    void solverInit(const PoolItemList & weakItems);
     // common solver run with the _jobQueue; Save results back to pool
     bool solving(const CapabilitySet & requires_caps = CapabilitySet(),
                 const CapabilitySet & conflict_caps = CapabilitySet());