* apt-pkg/algorithms.cc:

  - if the package was explicitly marked as ToRemove don't
    consider it as a candidate for FixByInstall

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 961f5c2fa1bfee4ff172c3efe16b9a280ae674b9..9abb7a947f91c757cf5adc120d6ae792be351f70 100644 (file)
--- 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 &&
                        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
                                 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 b103a32764abfabb9f63149663a7c7c26eab3aa4..57b32f8f635c2066f787b15f898126aa71cb7de0 100644 (file)
--- 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/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
 
 
 apt (0.8.8) unstable; urgency=low