From ddb286525d196b53683533648425c5c8f5288839 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Jun 2015 19:22:13 +0200 Subject: simplify Origin matchmaking for status files The old check is overly complicated nowadays as we have a pretty defining difference between packages from a Packages files coming from with a Release file (even if the file itself doesn't exist) and packages coming from the dpkg.status or directly out of *.deb's as these have no associated Release file. Git-Dch: Ignore --- apt-pkg/versionmatch.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'apt-pkg/versionmatch.cc') diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index c215f522c..2376ca8fd 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -281,12 +281,9 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (OrSite.empty() == false) { if (File.Site() == NULL) return false; - } else // so we are talking about file:// or status file - { - pkgCache::RlsFileIterator const RlsFile = File.ReleaseFile(); - if (strcmp(File.Site(),"") == 0 && RlsFile->Archive != 0 && strcmp(RlsFile.Archive(),"now") == 0) // skip the status file - return false; } + else if (File->Release == 0)// only 'bad' files like dpkg.status file has no release file + return false; return (ExpressionMatches(OrSite, File.Site())); /* both strings match */ } -- cgit v1.2.3