From 4cc152f93acf2eaf3ae66424cd4aaf47cad14a7b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 19 Dec 2006 20:44:54 +0100
Subject: * 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

---
 apt-pkg/algorithms.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'apt-pkg/algorithms.cc')

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)
-- 
cgit v1.2.3