]> git.saurik.com Git - apt.git/commitdiff
apt-pkg/algorithms.cc: if a package was added to the kill list via a DpkgBreaks,...
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 31 Aug 2010 11:27:59 +0000 (13:27 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 31 Aug 2010 11:27:59 +0000 (13:27 +0200)
apt-pkg/algorithms.cc

index a46dce2db9438c6e6be218b4e41e400feb07fe3e..d9e0d2f813e8b03e71eddd5cd4df9ffb0111a34c 100644 (file)
@@ -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;
               }