From 6ede8952f55a1bc356b42b1adc7b9bd504af943c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 17 Jan 2017 00:08:16 +0100 Subject: Read dpkg tables to handle architecture wildcards Our implementation of wildcards was rudimentary. It worked for some common ones, but it was also broken: For example, armel matched any-armel, but should match any-arm. With this commit, we load the correct tables from dpkg. Supported are both triplets and quadruplet tables (the latter introduced in dpkg 1.18.11). There are some odd things we have to deal with in the cache filter for historical and API reasons: * The character "*" must be accepted as an alternative to any - in fact it may appear anywhere in the wildcard as we also allow fnmatch() style wildcard matching on the commandline. * The code might get passed an arch with a minus at the end, for example the cmdline "install apt:any-arm-" will first try to check if any-arm- is a valid architecture. We deal with this by rejecting any wildcard ending in a minus. * Triplets are actually implemented by extending them to faux quadruplets - by prepending a "base" component for the architecture tuple, and "any" if there is a wildcard component. Once we have constructed a wildcard, it is transformed into an fnmatch() expression for historical reasons. In the future, we should really get a tuple class and implement matching in a better, more explicit way. This does for now though - it passes all the test cases and accepts all things it should accept. Closes: #748936 Thanks: James Clarke for the initial patch --- doc/examples/configure-index | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc/examples') diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 7ce5aef51..653bdec1e 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -751,3 +751,8 @@ translation::compress ""; sources::extensions ""; packages::extensions ""; dir::filelistdir ""; + +// Internal code. +dir::dpkg::tupletable ""; +dir::dpkg::triplettable ""; +dir::dpkg::cputable ""; -- cgit v1.2.3