diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-20 10:58:57 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-20 10:58:57 +0100 |
| commit | 020daa7b026cf1496959ccc9d062d95cb5f8ec02 (patch) | |
| tree | 157f334dd72e444565d2fcc945a98e10c9fe8d81 | |
| parent | 4cc152f93acf2eaf3ae66424cd4aaf47cad14a7b (diff) | |
* apt-pkg/algorithms.cc:
- make sure we have a candidateVer if we check it for downloadability
| -rw-r--r-- | apt-pkg/algorithms.cc | 2 | ||||
| -rw-r--r-- | po/apt-all.pot | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index e1b9406e2..5fa16e66f 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -497,7 +497,7 @@ void pkgProblemResolver::MakeScores() 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()) + if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable()) Score += 1; } diff --git a/po/apt-all.pot b/po/apt-all.pot index 0ac6df6c1..d2dbcb7a0 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2191,13 +2191,13 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1063 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" |