diff options
| author | Michael Vogt <mvo@debian.org> | 2014-07-10 13:16:50 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-07-10 13:16:50 +0200 |
| commit | 343325f4cc460b709fc929f85bc2a3d4691d63fe (patch) | |
| tree | f942f9ce2776a1c0653570615c87c80301021725 /apt-private | |
| parent | fdff5b03e981ace063269640001b3bc8f9a42f4c (diff) | |
| parent | 881de4cd8d432313e0ede1cc5857cae5b217e6d2 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
configure.ac
debian/changelog
doc/apt-verbatim.ent
doc/po/apt-doc.pot
doc/po/fr.po
po/ar.po
po/ast.po
po/bg.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/de.po
po/dz.po
po/el.po
po/es.po
po/eu.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/it.po
po/ja.po
po/km.po
po/ko.po
po/ku.po
po/lt.po
po/nb.po
po/ne.po
po/nl.po
po/nn.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po
po/th.po
po/tl.po
po/tr.po
po/uk.po
po/zh_CN.po
po/zh_TW.po
Diffstat (limited to 'apt-private')
| -rw-r--r-- | apt-private/private-output.cc | 5 | ||||
| -rw-r--r-- | apt-private/private-update.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 158bd5c71..7f8922138 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -118,7 +118,7 @@ static std::string GetFlagsStr(pkgCacheFile &CacheFile, pkgCache::PkgIterator P) std::string flags_str; if (state.NowBroken()) flags_str = "B"; - if (P.CurrentVer() && state.Upgradable()) + if (P.CurrentVer() && state.Upgradable() && state.CandidateVer != NULL) flags_str = "g"; else if (P.CurrentVer() != NULL) flags_str = "i"; @@ -229,7 +229,8 @@ 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()) { + if(P.CurrentVer() == V && state.Upgradable() && state.CandidateVer != NULL) + { strprintf(StatusStr, _("[installed,upgradable to: %s]"), CandidateVerStr.c_str()); } else if (P.CurrentVer() == V) { diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc index 0f2f7a8da..860d84b86 100644 --- a/apt-private/private-update.cc +++ b/apt-private/private-update.cc @@ -83,7 +83,7 @@ bool DoUpdate(CommandLine &CmdL) for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() != true; ++I) { pkgDepCache::StateCache &state = Cache[I]; - if (I->CurrentVer != 0 && state.Upgradable()) + if (I->CurrentVer != 0 && state.Upgradable() && state.CandidateVer != NULL) upgradable++; } const char *msg = P_( |