* apt-pkg/algorithms.cc:

  - when encountering a or-group in pkgProblemResolver::Resolver(), check
    if it IsCritical(), otherwise we may do checking on weak-depends and
    confuse the system badly

1 files changed, 5 insertions, 0 deletions

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 0d486d102..e1b9406e2 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -841,7 +841,12 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 	       OldEnd = LEnd;
 	    }
 	    else
+            {
 	       Start++;
+	       // We only worry about critical deps.
+	       if (Start.IsCritical() != true)
+                  continue;
+            }
 
 	    // Dep is ok
 	    if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)