From a5da6449447ee7f14fc0e271b6fe07739387ba8c Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 28 Jan 2012 11:46:10 -0800 Subject: apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that we resolve virtual package Breaks more effectively. Thanks to Colin Watson for the patch. Closes: #657695, LP: #922485. --- apt-pkg/algorithms.cc | 3 +-- debian/changelog | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 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 122052888..9bd5453e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -apt (0.8.16~exp12ubuntu1~ppa1) precise; urgency=low +apt (0.8.16~exp12ubuntu1) UNRELEASED; urgency=low + [ Michael Vogt ] * merge from debian/experimental: - new ABI - -- Michael Vogt Tue, 24 Jan 2012 20:07:38 +0100 + [ Steve Langasek ] + * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that + we resolve virtual package Breaks more effectively. Thanks to Colin + Watson for the patch. Closes: #657695, LP: #922485. + + -- Steve Langasek Sat, 28 Jan 2012 11:40:53 -0800 apt (0.8.16~exp12) experimental; urgency=low -- cgit v1.2.3