diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-08-21 22:53:25 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-11-25 11:32:19 +0100 |
| commit | 02b0afd5098534eff34a8fa1d44454c7a3e1ff09 (patch) | |
| tree | c352b5670fc18c6e97dbff53aa75538f923647d1 | |
| parent | 391c9f20208584bf429c7717047a0637d0d670fb (diff) | |
patterns: Add ?origin
| -rw-r--r-- | apt-pkg/cachefilter-patterns.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/cachefilter-patterns.h | 15 | ||||
| -rw-r--r-- | doc/apt-patterns.7.xml | 3 | ||||
| -rwxr-xr-x | test/integration/test-apt-patterns | 6 |
4 files changed, 26 insertions, 0 deletions
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 @@ -163,6 +164,11 @@ 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$)' |