2 files changed, 17 insertions, 0 deletions
diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc
index 12d8ae748..faf5735b8 100644
--- a/apt-pkg/cachefilter-patterns.cc
+++ b/apt-pkg/cachefilter-patterns.cc
@@ -430,6 +430,8 @@ std::unique_ptr<APT::CacheFilter::Matcher> PatternParser::aPattern(std::unique_p
       return std::make_unique<APT::CacheFilter::PackageArchitectureMatchesSpecification>(aWord(node->arguments[0]));
    if (node->matches("?archive", 1, 1))
       return std::make_unique<Patterns::VersionIsArchive>(aWord(node->arguments[0]));
+   if (node->matches("?codename", 1, 1))
+      return std::make_unique<Patterns::VersionIsCodename>(aWord(node->arguments[0]));
    if (node->matches("?all-versions", 1, 1))
       return std::make_unique<Patterns::VersionIsAllVersions>(aPattern(node->arguments[0]));
    if (node->matches("?any-version", 1, 1))
diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h
index d55cb6335..e6ea16c68 100644
--- a/apt-pkg/cachefilter-patterns.h
+++ b/apt-pkg/cachefilter-patterns.h
@@ -363,6 +363,21 @@ struct APT_HIDDEN VersionIsArchive : public VersionAnyMatcher
    }
 };
 
+struct APT_HIDDEN VersionIsCodename : public VersionAnyMatcher
+{
+   BaseRegexMatcher matcher;
+   VersionIsCodename(std::string const &pattern) : matcher(pattern) {}
+   bool operator()(pkgCache::VerIterator const &Ver) override
+   {
+      for (auto VF = Ver.FileList(); not VF.end(); VF++)
+      {
+	 if (VF.File().Codename() && matcher(VF.File().Codename()))
+	    return true;
+      }
+      return false;
+   }
+};
+
 struct APT_HIDDEN VersionIsOrigin : public VersionAnyMatcher
 {
    BaseRegexMatcher matcher;