summaryrefslogtreecommitdiff
path: root/apt-pkg/pkgcache.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:25 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:25 +0100
commit3b13b8a0b79d625d2913518529a34e92b4f41539 (patch)
tree404745c04c1eb4548bd6151034229c98d97d36f6 /apt-pkg/pkgcache.cc
parent4935c8af8acd8856211c0a527bf4dec4dace0d08 (diff)
parente1024dc0acf72b9615c0821f005364543775a58a (diff)
Merge branch 'pu/abi6'
Diffstat (limited to 'apt-pkg/pkgcache.cc')
-rw-r--r--apt-pkg/pkgcache.cc42
1 files changed, 1 insertions, 41 deletions
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 80dd1d1fa..5819a9b4a 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -125,7 +125,6 @@ bool pkgCache::Header::CheckSizes(Header &Against) const
// Cache::pkgCache - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-APT_IGNORE_DEPRECATED_PUSH
pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map), VS(nullptr), d(NULL)
{
// call getArchitectures() with cached=false to ensure that the
@@ -135,7 +134,6 @@ pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map), VS(nullptr), d(NULL)
if (DoMap == true)
ReMap();
}
-APT_IGNORE_DEPRECATED_POP
/*}}}*/
// Cache::ReMap - Reopen the cache file /*{{{*/
// ---------------------------------------------------------------------
@@ -562,19 +560,6 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
return NeedsNothing;
}
/*}}}*/
-// PkgIterator::CandVersion - Returns the candidate version string /*{{{*/
-// ---------------------------------------------------------------------
-/* Return string representing of the candidate version. */
-const char *
-pkgCache::PkgIterator::CandVersion() const
-{
- //TargetVer is empty, so don't use it.
- VerIterator version = pkgPolicy(Owner).GetCandidateVer(*this);
- if (version.IsGood())
- return version.VerStr();
- return 0;
-}
- /*}}}*/
// PkgIterator::CurVersion - Returns the current version string /*{{{*/
// ---------------------------------------------------------------------
/* Return string representing of the current version. */
@@ -600,15 +585,10 @@ operator<<(std::ostream& out, pkgCache::PkgIterator Pkg)
return out << "invalid package";
string current = string(Pkg.CurVersion() == 0 ? "none" : Pkg.CurVersion());
-APT_IGNORE_DEPRECATED_PUSH
- string candidate = string(Pkg.CandVersion() == 0 ? "none" : Pkg.CandVersion());
-APT_IGNORE_DEPRECATED_POP
string newest = string(Pkg.VersionList().end() ? "none" : Pkg.VersionList().VerStr());
out << Pkg.Name() << " [ " << Pkg.Arch() << " ] < " << current;
- if (current != candidate)
- out << " -> " << candidate;
- if ( newest != "none" && candidate != newest)
+ if ( newest != "none")
out << " | " << newest;
if (Pkg->VersionList == 0)
out << " > ( none )";
@@ -1009,16 +989,6 @@ const char * pkgCache::VerIterator::MultiArchType() const
return "none";
}
/*}}}*/
-// RlsFileIterator::IsOk - Checks if the cache is in sync with the file /*{{{*/
-// ---------------------------------------------------------------------
-/* This stats the file and compares its stats with the ones that were
- stored during generation. Date checks should probably also be
- included here. */
-bool pkgCache::RlsFileIterator::IsOk()
-{
- return true;
-}
- /*}}}*/
// RlsFileIterator::RelStr - Return the release string /*{{{*/
string pkgCache::RlsFileIterator::RelStr()
{
@@ -1036,16 +1006,6 @@ string pkgCache::RlsFileIterator::RelStr()
return Res;
}
/*}}}*/
-// PkgFileIterator::IsOk - Checks if the cache is in sync with the file /*{{{*/
-// ---------------------------------------------------------------------
-/* This stats the file and compares its stats with the ones that were
- stored during generation. Date checks should probably also be
- included here. */
-bool pkgCache::PkgFileIterator::IsOk()
-{
- return true;
-}
- /*}}}*/
string pkgCache::PkgFileIterator::RelStr() /*{{{*/
{
std::string Res;