Browse Source

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)

Michael Vogt 16 years ago
parent
commit
914cc8a443
1 changed files with 2 additions and 1 deletions
  1. 2 1
      apt-pkg/algorithms.cc

+ 2 - 1
apt-pkg/algorithms.cc

@@ -1097,7 +1097,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 
 
 		  if (Start->Type == pkgCache::Dep::DpkgBreaks)
 		  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
 		     // does not help, the breaks goes onto the
 		     // kill list
 		     // kill list
 		     // FIXME: use DoUpgrade(Pkg) instead?
 		     // FIXME: use DoUpgrade(Pkg) instead?
@@ -1122,6 +1122,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 		  LEnd++;
 		  LEnd++;
 		  
 		  
 		  if (Start->Type != pkgCache::Dep::Conflicts &&
 		  if (Start->Type != pkgCache::Dep::Conflicts &&
+                      Start->Type != pkgCache::Dep::DpkgBreaks &&
 		      Start->Type != pkgCache::Dep::Obsoletes)
 		      Start->Type != pkgCache::Dep::Obsoletes)
 		     break;
 		     break;
 	       }
 	       }