summaryrefslogtreecommitdiff
path: root/apt-pkg/algorithms.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-12-19 10:17:54 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2006-12-19 10:17:54 +0100
commitb6f0036a8ed8fb5278d6fb9da601edc254eb03fe (patch)
treed86eb890f324e028537ecb100d58da427124a98c /apt-pkg/algorithms.cc
parent3dc863efa5f825a16b46ccba0771e86895459c77 (diff)
parent4172c78468a04078c97146dbc2e2979e63906f5b (diff)
* merged with mainline
Diffstat (limited to 'apt-pkg/algorithms.cc')
-rw-r--r--apt-pkg/algorithms.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 58498aa19..5e878ff65 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -509,8 +509,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;
}