summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorColin Watson <cjwatson@ubuntu.com>2012-01-29 13:53:25 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-01-29 13:53:25 +0100
commitb47053bdef63de485cda2bc2e57773e9a0f48cf8 (patch)
tree5dd6cd34e8d580e2ed5f520a522ef432eac9b5af /apt-pkg
parent737c7a7b854aa833d75994b67619c5852aa2085d (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)
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;
}
}