From 02b0afd5098534eff34a8fa1d44454c7a3e1ff09 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Wed, 21 Aug 2019 22:53:25 +0200
Subject: patterns: Add ?origin

---
 apt-pkg/cachefilter-patterns.cc    |  2 ++
 apt-pkg/cachefilter-patterns.h     | 15 +++++++++++++++
 doc/apt-patterns.7.xml             |  3 +++
 test/integration/test-apt-patterns |  6 ++++++
 4 files changed, 26 insertions(+)

diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc
index aeed31263..2ba89e5d4 100644
--- a/apt-pkg/cachefilter-patterns.cc
+++ b/apt-pkg/cachefilter-patterns.cc
@@ -238,6 +238,8 @@ std::unique_ptr<APT::CacheFilter::Matcher> PatternParser::aPattern(std::unique_p
       return std::make_unique<APT::CacheFilter::NOTMatcher>(aPattern(node->arguments[0]).release());
    if (node->matches("?obsolete", 0, 0))
       return std::make_unique<Patterns::PackageIsObsolete>();
+   if (node->matches("?origin", 1, 1))
+      return std::make_unique<Patterns::VersionIsOrigin>(aWord(node->arguments[0]));
    if (node->matches("?source-package", 1, 1))
       return std::make_unique<Patterns::VersionIsSourcePackage>(aWord(node->arguments[0]));
    if (node->matches("?source-version", 1, 1))
diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h
index c92a152d6..3d1735442 100644
--- a/apt-pkg/cachefilter-patterns.h
+++ b/apt-pkg/cachefilter-patterns.h
@@ -275,6 +275,21 @@ struct VersionIsArchive : public VersionAnyMatcher
    }
 };
 
+struct VersionIsOrigin : public VersionAnyMatcher
+{
+   BaseRegexMatcher matcher;
+   VersionIsOrigin(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().Origin() && matcher(VF.File().Origin()))
+	    return true;
+      }
+      return false;
+   }
+};
+
 struct VersionIsSourcePackage : public VersionAnyMatcher
 {
    BaseRegexMatcher matcher;
diff --git a/doc/apt-patterns.7.xml b/doc/apt-patterns.7.xml
index fe82ca1b8..5f0298f17 100644
--- a/doc/apt-patterns.7.xml
+++ b/doc/apt-patterns.7.xml
@@ -115,6 +115,9 @@
      <varlistentry><term><code>?archive(REGEX)</code></term>
      <listitem><para>Selects versions that come from the archive that matches the specified regular expression. Archive, here, means the values after <code>a=</code> in <command>apt-cache policy</command>.</para></listitem>
      </varlistentry>
+     <varlistentry><term><code>?origin(REGEX)</code></term>
+     <listitem><para>Selects versions that come from the origin that matches the specified regular expression. Origin, here, means the values after <code>o=</code> in <command>apt-cache policy</command>.</para></listitem>
+     </varlistentry>
      <varlistentry><term><code>?source-package(REGEX)</code></term>
      <listitem><para>Selects versions where the source package name matches the specified regular expression.</para></listitem>
      </varlistentry>
diff --git a/test/integration/test-apt-patterns b/test/integration/test-apt-patterns
index 2fa5d336d..c0b0c18d0 100755
--- a/test/integration/test-apt-patterns
+++ b/test/integration/test-apt-patterns
@@ -22,6 +22,7 @@ insertpackage 'unstable' 'not-obsolete' 'all' '2.0'
 
 insertpackage 'unstable' 'foreign' 'amd64' '2.0'
 
+getoriginfromsuite() { echo -n 'meow'; }
 setupaptarchive
 
 testsuccess aptmark auto automatic1 automatic2
@@ -162,6 +163,11 @@ conf-only/now 1.0 i386 [residual-config]
 foreign/unstable 2.0 amd64
 not-obsolete/unstable 2.0 i386 [upgradable from: 1.0]" apt list '?not(?obsolete)'
 
+testsuccessequal "Listing...
+available/unstable 1.0 all
+foreign/unstable 2.0 amd64
+not-obsolete/unstable 2.0 i386 [upgradable from: 1.0]" apt list '?origin(^meow$)'
+
 testsuccessequal "Listing...
 automatic1/now 1.0 i386 [installed,local]
 automatic2/now 1.0 i386 [installed,local]" apt list '?source-package(^automatic$)'
-- 
cgit v1.2.3-70-g09d2