diff options
| author | Colin Watson <cjwatson@ubuntu.com> | 2012-01-29 13:53:25 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-01-29 13:53:25 +0100 |
| commit | b47053bdef63de485cda2bc2e57773e9a0f48cf8 (patch) | |
| tree | 5dd6cd34e8d580e2ed5f520a522ef432eac9b5af | |
| parent | 737c7a7b854aa833d75994b67619c5852aa2085d (diff) | |
* 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)
| -rw-r--r-- | apt-pkg/algorithms.cc | 3 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 7 insertions, 3 deletions
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 |