From 94b185bb738e063bcc387e31b39dcd041f283766 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 26 Nov 2019 11:45:44 +0100
Subject: patterns: Implement ?narrow(...), as ?any-version(?and(...))

This is pure syntactic sugar - ?narrow does not exist in the
abstract syntax.
---
 apt-pkg/cachefilter-patterns.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'apt-pkg/cachefilter-patterns.cc')

diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc
index 8b8695f71..f202df796 100644
--- a/apt-pkg/cachefilter-patterns.cc
+++ b/apt-pkg/cachefilter-patterns.cc
@@ -258,11 +258,13 @@ std::unique_ptr<APT::CacheFilter::Matcher> PatternParser::aPattern(std::unique_p
       return std::make_unique<APT::CacheFilter::PackageNameMatchesFnmatch>(aWord(node->arguments[0]));
 
    // Variable argument patterns
-   if (node->matches("?and", 0, -1))
+   if (node->matches("?and", 0, -1) || node->matches("?narrow", 0, -1))
    {
       auto pattern = std::make_unique<APT::CacheFilter::ANDMatcher>();
       for (auto &arg : node->arguments)
 	 pattern->AND(aPattern(arg).release());
+      if (node->term == "?narrow")
+	 return std::make_unique<Patterns::VersionIsAnyVersion>(std::move(pattern));
       return pattern;
    }
    if (node->matches("?or", 0, -1))
-- 
cgit v1.2.3