From a3f1a6ccd29480ae45e0a82871b05e009741d7fa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Nov 2010 12:24:48 +0100 Subject: * apt-pkg/algorithms.cc: - if the package was explicitly marked as ToRemove don't consider it as a candidate for FixByInstall --- apt-pkg/algorithms.cc | 1 + debian/changelog | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 diff --git a/debian/changelog b/debian/changelog index b103a3276..57b32f8f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,11 @@ apt (0.8.9) UNRELEASED; urgency=low * apt-pkg/orderlist.cc: - try fixing before removing even if the fix is hidden in a provides, hidden in the #590438 testcase + * apt-pkg/algorithms.cc: + - if the package was explicitly marked as ToRemove don't + consider it as a candidate for FixByInstall - -- David Kalnischkies Tue, 09 Nov 2010 14:16:41 +0100 + -- David Kalnischkies Wed, 10 Nov 2010 12:23:29 +0100 apt (0.8.8) unstable; urgency=low -- cgit v1.2.3