diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-11-10 12:24:48 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-11-10 12:24:48 +0100 |
| commit | a3f1a6ccd29480ae45e0a82871b05e009741d7fa (patch) | |
| tree | 71eedc195b32acda5f3d2a21c9f1da598a446743 | |
| parent | eb3947c6510042c054a319d8053821faf7244dea (diff) | |
| download | apt-a3f1a6ccd29480ae45e0a82871b05e009741d7fa.tar.gz | |
* apt-pkg/algorithms.cc:
- if the package was explicitly marked as ToRemove don't
consider it as a candidate for FixByInstall
| -rw-r--r-- | apt-pkg/algorithms.cc | 1 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 5 insertions, 1 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 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 <kalnischkies@gmail.com> Tue, 09 Nov 2010 14:16:41 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 10 Nov 2010 12:23:29 +0100 apt (0.8.8) unstable; urgency=low |