diff options
author | Michael Vogt <egon@debian-devbox> | 2011-10-14 11:54:12 +0200 |
---|---|---|
committer | Michael Vogt <egon@debian-devbox> | 2011-10-14 11:54:12 +0200 |
commit | 1d51f78e9d128191ff8b2d48e42d90ebdbff2588 (patch) | |
tree | af05e41a53bcc9f22f146573ed0f1ff5311b97ad /apt-pkg/algorithms.cc | |
parent | 324fc8af296953857ebfc76deaadd4d224e081e3 (diff) | |
parent | f3b8d8571faf62265266ac0f9da60ad73885214b (diff) |
merged from lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/algorithms.cc')
-rw-r--r-- | apt-pkg/algorithms.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 5fbcb47be..6ac69032b 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1002,7 +1002,7 @@ bool pkgProblemResolver::Resolve(bool 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; |