summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/algorithms.cc2
-rw-r--r--debian/changelog4
2 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2fca0f6af..4c2ea0f2d 100644
--- 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 787425193..a3018e4f6 100644
--- 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