summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2018-04-11 12:45:38 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2018-05-11 17:58:46 +0200
commitc5e2fa2b772524c03b0c7f777ffea6f2485fe6ca (patch)
tree53626ad822afdb91af880211ad7747e617df60aa /apt-pkg
parent117ab302176a65536d9d55de30c53e94f08057ae (diff)
Deprectate buggy/incorrect Rls/PkgFile::IsOk methods
With the advent of compressed files and especially with in-memory post-processed files the simple assumptions made in IsOk are no longer true. Worse, they are at best duplicates of checks performed by the cache generation (and validation) earlier and isn't used in too many places. It is hence best to simply get right of these calls instead of trying to fix them.
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/cacheiterators.h2
-rw-r--r--apt-pkg/pkgcache.cc14
2 files changed, 2 insertions, 14 deletions
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 52915aae4..20853061e 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -422,6 +422,7 @@ class pkgCache::RlsFileIterator : public Iterator<ReleaseFile, RlsFileIterator>
inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;}
inline bool Flagged(pkgCache::Flag::ReleaseFileFlags const flag) const {return (S->Flags & flag) == flag; }
+ APT_DEPRECATED_MSG("Can be remove without replacement; it is a no-op")
bool IsOk();
std::string RelStr();
@@ -457,6 +458,7 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator>
inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;}
inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;}
+ APT_DEPRECATED_MSG("Can be remove without replacement; it is a no-op")
bool IsOk();
std::string RelStr();
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 6b9c645a4..92f0cb777 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -968,13 +968,6 @@ const char * pkgCache::VerIterator::MultiArchType() const
included here. */
bool pkgCache::RlsFileIterator::IsOk()
{
- struct stat Buf;
- if (stat(FileName(),&Buf) != 0)
- return false;
-
- if (Buf.st_size != (signed)S->Size || Buf.st_mtime != S->mtime)
- return false;
-
return true;
}
/*}}}*/
@@ -1002,13 +995,6 @@ string pkgCache::RlsFileIterator::RelStr()
included here. */
bool pkgCache::PkgFileIterator::IsOk()
{
- struct stat Buf;
- if (stat(FileName(),&Buf) != 0)
- return false;
-
- if (Buf.st_size != (signed)S->Size || Buf.st_mtime != S->mtime)
- return false;
-
return true;
}
/*}}}*/