patterns: Add ?version

2 files changed, 27 insertions, 0 deletions

diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc
index 42bc2babb..ba341df60 100644
--- a/apt-pkg/cachefilter-patterns.cc
+++ b/apt-pkg/cachefilter-patterns.cc
@@ -240,6 +240,8 @@ std::unique_ptr<APT::CacheFilter::Matcher> PatternParser::aPattern(std::unique_p
       return std::make_unique<APT::CacheFilter::TrueMatcher>();
    if (node->matches("?upgradable", 0, 0))
       return std::make_unique<Patterns::PackageIsUpgradable>(file);
+   if (node->matches("?version", 1, 1))
+      return std::make_unique<Patterns::VersionIsVersion>(aWord(node->arguments[0]));
    if (node->matches("?virtual", 0, 0))
       return std::make_unique<Patterns::PackageIsVirtual>();
    if (node->matches("?x-name-fnmatch", 1, 1))
diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h
index f13edbbc2..4959b0f14 100644
--- a/apt-pkg/cachefilter-patterns.h
+++ b/apt-pkg/cachefilter-patterns.h
@@ -244,6 +244,31 @@ struct PackageIsVirtual : public PackageMatcher
       return Pkg->VersionList == 0;
    }
 };
+
+struct VersionAnyMatcher : public Matcher
+{
+   bool operator()(pkgCache::GrpIterator const &Grp) override { return false; }
+   bool operator()(pkgCache::VerIterator const &Ver) override = 0;
+   bool operator()(pkgCache::PkgIterator const &Pkg) override
+   {
+      for (auto Ver = Pkg.VersionList(); not Ver.end(); Ver++)
+      {
+         if ((*this)(Ver))
+            return true;
+      }
+      return false;
+   }
+};
+
+struct VersionIsVersion : public VersionAnyMatcher
+{
+   BaseRegexMatcher matcher;
+   VersionIsVersion(std::string const &pattern) : matcher(pattern) {}
+   bool operator()(pkgCache::VerIterator const &Ver) override
+   {
+      return matcher(Ver.VerStr());
+   }
+};
 } // namespace Patterns
 } // namespace Internal
 } // namespace APT