Upgrade: Do NOT delete packages which have unresolved dependencies -->

  Ask the user. Bug 258322

diff --git a/zypp/solver/detail/ResolverContext.cc b/zypp/solver/detail/ResolverContext.cc
index 356d90d..e960413 100644 (file)
--- a/zypp/solver/detail/ResolverContext.cc
+++ b/zypp/solver/detail/ResolverContext.cc
@@ -432,13 +432,11 @@ ResolverContext::uninstall (PoolItem_Ref item, bool part_of_upgrade, bool due_to
 
     assert (! (due_to_obsolete && due_to_unlink));
 
-    if ( ( (forceResolve() // This is the behaviour of ZMD
-           || upgradeMode())
-         && (status.isToBeInstalledNotSoft()             // \ The resolvable will be installed
-             || item.status().isToBeInstalledNotSoft())) // / explicit. (And not by WEAK dependencies like supplements)
+    if ( ( forceResolve() // This is the behaviour of ZMD
+          && (status.isToBeInstalledNotSoft()             // \ The resolvable will be installed
+              || item.status().isToBeInstalledNotSoft())) // / explicit. (And not by WEAK dependencies like supplements)
         
-        || ( (!forceResolve() // This is the bahaviour of YaST
-              && !upgradeMode())
+        || ( !forceResolve() // This is the bahaviour of YaST
              && ((status.staysInstalled() || status.isToBeInstalledNotSoft())                   //   \ We will have the resolvable
                  && (item.status().staysInstalled() || item.status().isToBeInstalledNotSoft())  //   / available.
                  || status.isToBeInstalledNotSoft())                                            //   is to be installed e.g. due solver requirement