summaryrefslogtreecommitdiff
path: root/apt-pkg/algorithms.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-11-15 10:28:27 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-11-15 10:28:27 +0100
commit58a642755c63cde3cf377d3719d66add27b13d65 (patch)
tree92719b94ccca55b5e128f28e9499e1ec331a5440 /apt-pkg/algorithms.cc
parentfd8bb61d2945d2e2f19f0e0a753129235717a9f3 (diff)
parent3cf1e4b50a9bb439c4f54a631cfebbb6c4d1ea7d (diff)
merged from debian
Diffstat (limited to 'apt-pkg/algorithms.cc')
-rw-r--r--apt-pkg/algorithms.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 961f5c2fa..9abb7a947 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1062,6 +1062,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
else if (TryFixByInstall == true &&
Start.TargetPkg()->CurrentVer == 0 &&
Cache[Start.TargetPkg()].Delete() == false &&
+ (Flags[Start.TargetPkg()->ID] & ToRemove) != ToRemove &&
Cache.GetCandidateVer(Start.TargetPkg()).end() == false)
{
/* Before removing or keeping the package with the broken dependency