From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 31 Aug 2010 11:27:59 +0000 (+0200)
Subject: apt-pkg/algorithms.cc: if a package was added to the kill list via a DpkgBreaks,... 
X-Git-Tag: 0.8.3~3^2~2^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/914cc8a4438fd4f8c060599fa1971b80236a016e

apt-pkg/algorithms.cc: if a package was added to the kill list via a DpkgBreaks, make sure to break in the loop (just like for a conflict)
---

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index a46dce2db..d9e0d2f81 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1097,7 +1097,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 
 		  if (Start->Type == pkgCache::Dep::DpkgBreaks)
 		  {
-		     // first, try upgradring the package, if that
+		     // first, try upgrading the package, if that
 		     // does not help, the breaks goes onto the
 		     // kill list
 		     // FIXME: use DoUpgrade(Pkg) instead?
@@ -1122,6 +1122,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 		  LEnd++;
 		  
 		  if (Start->Type != pkgCache::Dep::Conflicts &&
+                      Start->Type != pkgCache::Dep::DpkgBreaks &&
 		      Start->Type != pkgCache::Dep::Obsoletes)
 		     break;
 	       }