diff options
| -rw-r--r-- | apt-pkg/cachefilter-patterns.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/cachefilter-patterns.h | 19 | ||||
| -rw-r--r-- | doc/apt-patterns.7.xml | 3 | ||||
| -rwxr-xr-x | test/integration/test-apt-patterns | 3 |
4 files changed, 27 insertions, 0 deletions
diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc index f202df796..8214c388a 100644 --- a/apt-pkg/cachefilter-patterns.cc +++ b/apt-pkg/cachefilter-patterns.cc @@ -216,6 +216,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("?all-versions", 1, 1)) + return std::make_unique<Patterns::VersionIsAllVersions>(aPattern(node->arguments[0])); if (node->matches("?any-version", 1, 1)) return std::make_unique<Patterns::VersionIsAnyVersion>(aPattern(node->arguments[0])); if (node->matches("?automatic", 0, 0)) diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h index 26b42d04b..8c5561c82 100644 --- a/apt-pkg/cachefilter-patterns.h +++ b/apt-pkg/cachefilter-patterns.h @@ -260,6 +260,25 @@ struct VersionAnyMatcher : public Matcher } }; +struct VersionIsAllVersions : public Matcher +{ + std::unique_ptr<APT::CacheFilter::Matcher> base; + VersionIsAllVersions(std::unique_ptr<APT::CacheFilter::Matcher> base) : base(std::move(base)) {} + bool operator()(pkgCache::GrpIterator const &) override { return false; } + bool operator()(pkgCache::VerIterator const &Ver) override + { + return (*base)(Ver); + } + bool operator()(pkgCache::PkgIterator const &Pkg) override + { + for (auto Ver = Pkg.VersionList(); not Ver.end(); Ver++) + { + if (not(*this)(Ver)) + return false; + } + return true; + } +}; struct VersionIsAnyVersion : public VersionAnyMatcher { diff --git a/doc/apt-patterns.7.xml b/doc/apt-patterns.7.xml index c2549f620..04f97e878 100644 --- a/doc/apt-patterns.7.xml +++ b/doc/apt-patterns.7.xml @@ -65,6 +65,9 @@ <para> </para> <variablelist> + <varlistentry><term><code>?all-versions(PATTERN)</code></term> + <listitem><para>Selects packages where all versions match PATTERN. When matching versions instead, same as PATTERN.</para></listitem> + </varlistentry> <varlistentry><term><code>?any-version(PATTERN)</code></term> <listitem><para>Selects any version where the pattern matches on the version.</para> <para>For example, while <code>?and(?version(1),?version(2))</code> matches a package which has one version containing 1 and one version containing 2, <code>?any-version(?and(?version(1),?version(2)))</code> restricts the <code>?and</code> to act on the same version.</para></listitem> diff --git a/test/integration/test-apt-patterns b/test/integration/test-apt-patterns index 291aad1d4..f726d0576 100755 --- a/test/integration/test-apt-patterns +++ b/test/integration/test-apt-patterns @@ -121,6 +121,9 @@ not-obsolete/unstable 2.0 i386 [upgradable from: 1.0] N: There is 1 additional version. Please use the '-a' switch to see it" apt list '?narrow(?version(^1\.0$),?name(not-obsolete))' +testsuccessequal "Listing... +foreign/unstable 2.0 amd64 +not-obsolete/unstable 2.0 i386 [upgradable from: 1.0]" apt list '?not(?all-versions(?version(^1)))' msgmsg "Package patterns" |