diff options
author | Michael Vogt <egon@bottom> | 2006-12-19 14:50:16 +0100 |
---|---|---|
committer | Michael Vogt <egon@bottom> | 2006-12-19 14:50:16 +0100 |
commit | df01b0d0d741eae61657b28a5111f40f05c215fe (patch) | |
tree | f5ec7c4b59ecf01e9e75d37bc9f9d6c794c83167 /apt-pkg/algorithms.cc | |
parent | c04a8d16e28bc82a76a31dba23244390a76fbcbb (diff) | |
parent | 714ee06cb1f8892f283bcdcfbb7ebbba8d642193 (diff) |
* merged apt--curl-https branch
Diffstat (limited to 'apt-pkg/algorithms.cc')
-rw-r--r-- | apt-pkg/algorithms.cc | 6 |
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; } |