* apt-pkg/algorithms.cc:

  - if a package is garbage, don't try to save it with FixByInstall

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2fca0f6afa34a104a61cb4565e4c3c83b8ad1803..4c2ea0f2da9e89501a66832e4ac670e4cc789e5e 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1035,7 +1035,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
                     if (BrokenFix == false || DoUpgrade(I) == false)
                     {
                        // Consider other options
-                       if (InOr == false)
+                       if (InOr == false || Cache[I].Garbage == true)
                        {
                           if (Debug == true)
                              clog << "  Removing " << I.FullName(false) << " rather than change " << Start.TargetPkg().FullName(false) << endl;

diff --git a/debian/changelog b/debian/changelog
index 7874251930f9966913dcf294c76dce39fccbb777..a3018e4f63fea36816788c49f5a22a429b421b1e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ apt (0.8.16~exp7) experimental; urgency=low
   * cmdline/apt-get.cc:
     - follow Provides in the evaluation of saving candidates, too, for
       statisfying garbage package dependencies (Closes: #640590)
+  * apt-pkg/algorithms.cc:
+    - if a package is garbage, don't try to save it with FixByInstall
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 20 Sep 2011 13:25:31 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 20 Sep 2011 14:19:38 +0200
 
 apt (0.8.16~exp6) experimental; urgency=low