diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-01-31 22:32:45 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-01-31 23:24:59 +0100 |
| commit | 5025879e3fdd705bb0607ff8f51a680749c5972a (patch) | |
| tree | 373cff10f4b91ae2d33b23ef0f28461828c6031c /apt-pkg/cachefilter.h | |
| parent | aa3e7b3287a20b464237c869483111abc7e9d815 (diff) | |
support <libc>-<kernel>-<cpu> in architecture specs
APT has a different understanding than dpkg (#748936) what matches and
what doesn't match an architecture specification as it isn't converting
back (and forward) to Debian triplets. That has to eventually be solved
some way or the other, but until that happens we change the matching in
apt so that porters can continue their work on non-gnu libc-ports even
if policy doesn't specify that yet (and dpkg just supporting it "by
accident" via triplets).
The initial patch was reformatted, fixed in terms of patterns containing
"any-any", dealing with expanding an arch without libc to gnu while a
pattern expands libc to any, the parsedepends test was fixed (the new
if's were inserted one step too early) and another test just for the
specifications added.
Closes: #812212
Thanks: Bálint Réczey for initial patch
Diffstat (limited to 'apt-pkg/cachefilter.h')
| -rw-r--r-- | apt-pkg/cachefilter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index 9970b5b22..30a3368e5 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -115,11 +115,11 @@ class PackageArchitectureMatchesSpecification : public PackageMatcher { /*{{{*/ /** \class PackageArchitectureMatchesSpecification \brief matching against architecture specification strings - The strings are of the format <kernel>-<cpu> where either component, + The strings are of the format <libc>-<kernel>-<cpu> where either component, or the whole string, can be the wildcard "any" as defined in debian-policy §11.1 "Architecture specification strings". - Examples: i386, mipsel, linux-any, any-amd64, any */ + Examples: i386, mipsel, musl-linux-amd64, linux-any, any-amd64, any */ std::string literal; std::string complete; bool isPattern; |