* apt-pkg/algorithms.cc:

  - make sure we have a candidateVer if we check it for downloadability

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index e1b9406e2341f9d85d98793b055ecf055ab6363d..5fa16e66f9bd9f45095feff8af40f6302c7f3228 100644 (file)
--- 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
       */
          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;
    }
 
         Score += 1;
    }
 

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 0ac6df6c1c88991eb7e606ed963dc001f4e023a4..d2dbcb7a0022f57067e7653a601e9472539b711a 100644 (file)
--- 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 ""
 
 "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 ""
 
 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 ""
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""