From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 29 Jan 2012 12:53:25 +0000 (+0100)
Subject: * apt-pkg/algorithms.cc:
X-Git-Tag: 0.9.0~23^2~7
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b47053bdef63de485cda2bc2e57773e9a0f48cf8

* apt-pkg/algorithms.cc:
  - don't break out of the main-resolver loop for Breaks to deal with all
    of them in a single iteration (Closes: #657695, LP: #922485)
---

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index f7a333606..7a9586ca0 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1098,8 +1098,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
 		  LEnd->Dep = End;
 		  LEnd++;
 		  
-		  if (Start->Type != pkgCache::Dep::Conflicts &&
-		      Start->Type != pkgCache::Dep::Obsoletes)
+		  if (Start.IsNegative() == false)
 		     break;
 	       }
 	    }
diff --git a/debian/changelog b/debian/changelog
index c3fadf8bc..3a1f0f9ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,12 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
     - for cross-build-dependencies M-A: none should be DEB_HOST_ARCH,
       not DEB_BUILD_ARCH (Closes: #646288)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 29 Jan 2012 13:14:01 +0100
+  [ Colin Watson ]
+  * apt-pkg/algorithms.cc:
+    - don't break out of the main-resolver loop for Breaks to deal with all
+      of them in a single iteration (Closes: #657695, LP: #922485)
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 29 Jan 2012 13:50:10 +0100
 
 apt (0.8.16~exp12) experimental; urgency=low