Ensure we have a Policy in CacheFile.BuildDepCache()

This partly reverts d059cc2 and fixes bug #753297 in a more
general way by ensuring that CacheFile.BuildDepCache() builds
a pkgPolicy if there isn't one already.

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 0fd40106f677b1751d52adb353d0d5e3cefb710f..ea3d454806223943e2902ebef8e1eb2071ec44b7 100644 (file)
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -143,6 +143,9 @@ bool pkgCacheFile::BuildDepCache(OpProgress *Progress)
    if (DCache != NULL)
       return true;
 
+   if (BuildPolicy(Progress) == false)
+      return false;
+
    DCache = new pkgDepCache(Cache,Policy);
    if (_error->PendingError() == true)
       return false;

diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc
index 159e1d8f188d044685b9765cf38f77fc5a1fb729..e37e7b227455e7a44aebc76a2a71d0a1ba203e6c 100644 (file)
--- a/apt-private/private-cacheset.cc
+++ b/apt-private/private-cacheset.cc
@@ -55,10 +55,7 @@ bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
       }
       else if (_config->FindB("APT::Cmd::Upgradable") == true)
       {
-         pkgPolicy *policy = CacheFile.GetPolicy();
-         if(P.CurrentVer() && 
-            state.Upgradable() && 
-            policy->GetCandidateVer(P) != P.CurrentVer())
+         if(P.CurrentVer() && state.Upgradable())
          {
              pkgPolicy *policy = CacheFile.GetPolicy();
              output_set.insert(policy->GetCandidateVer(P));

diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 2120b7a83674ddfb6db28a013565f4368f2daa5a..522f7682df1d110bf5319b7012b340b576d9bb57 100644 (file)
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -229,10 +229,7 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,       /*{{{*/
       std::string CandidateVerStr = GetCandidateVersion(CacheFile, P);
       std::string InstalledVerStr = GetInstalledVersion(CacheFile, P);
       std::string StatusStr;
-      if(P.CurrentVer() == V && 
-         state.Upgradable() &&
-         state.CandidateVer != NULL &&
-         policy->GetCandidateVer(P) != P.CurrentVer())
+      if(P.CurrentVer() == V && state.Upgradable())
       {
          strprintf(StatusStr, _("[installed,upgradable to: %s]"),
                    CandidateVerStr.c_str());