summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/algorithms.cc6
-rw-r--r--debian/changelog6
2 files changed, 8 insertions, 4 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 8d1e4e8e8..0d486d102 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -494,8 +494,10 @@ void pkgProblemResolver::MakeScores()
Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority];
/* This helps to fix oddball problems with conflicting packages
- on the same level. We enhance the score of installed packages */
- if (I->CurrentVer != 0)
+ on the same level. We enhance the score of installed packages
+ if those are not obsolete
+ */
+ if (I->CurrentVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())
Score += 1;
}
diff --git a/debian/changelog b/debian/changelog
index 127c5fd83..06cede531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-apt (0.6.46.5) unstable; urgency=low
+apt (0.6.46.5) UNRELEASED; urgency=low
* apt-pkg/algorithm.cc:
- use clog for all debugging
+ - only increase the score of installed applications if they
+ are not obsolete
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100
apt (0.6.46.4) unstable; urgency=high