refactor EDSP classes for better internal reuse

[apt.git] / apt-pkg / versionmatch.cc

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index c215f522c09b6e7b2dac79235bc0ce37291e2a62..2376ca8fd80de21596b866fd42b5626da1447102 100644 (file)
--- 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;
       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 */
    }
 
       return (ExpressionMatches(OrSite, File.Site())); /* both strings match */
    }