summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-11-10 12:24:48 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-11-10 12:24:48 +0100
commita3f1a6ccd29480ae45e0a82871b05e009741d7fa (patch)
tree71eedc195b32acda5f3d2a21c9f1da598a446743 /apt-pkg
parenteb3947c6510042c054a319d8053821faf7244dea (diff)
* apt-pkg/algorithms.cc:
- if the package was explicitly marked as ToRemove don't consider it as a candidate for FixByInstall
Diffstat (limited to 'apt-pkg')
-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