diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-08-31 13:27:59 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-08-31 13:27:59 +0200 |
| commit | 914cc8a4438fd4f8c060599fa1971b80236a016e (patch) | |
| tree | 9857c4dedae0600010af7d1e096067cfb83076de /apt-pkg/algorithms.cc | |
| parent | 4429616bd6b13499981da3d7d542f71e4f3ece8c (diff) | |
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)
Diffstat (limited to 'apt-pkg/algorithms.cc')
| -rw-r--r-- | apt-pkg/algorithms.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |