summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2012-01-28 11:46:10 -0800
committerSteve Langasek <steve.langasek@canonical.com>2012-01-28 11:46:10 -0800
commita5da6449447ee7f14fc0e271b6fe07739387ba8c (patch)
treefa7d824edb37a6973cfe0942c360e034258a9423 /apt-pkg
parent5b172c0263c12f1163cfa17170a9b0da917e782c (diff)
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.
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/algorithms.cc3
1 files changed, 1 insertions, 2 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;
}
}