diff options
author | Julian Andres Klode <julian.klode@canonical.com> | 2020-12-14 14:28:35 +0100 |
---|---|---|
committer | Julian Andres Klode <julian.klode@canonical.com> | 2020-12-27 13:36:07 +0100 |
commit | 53d18fe48618c9864de021cc5862685faac7c752 (patch) | |
tree | 75426646b4aac37272f746b97388f52002922092 /apt-pkg | |
parent | 4215b6b2ce64f7bd0988c63c8d7d3e34833ec813 (diff) |
patterns: Add dependency patterns ?depends, ?conflicts, etc.
These match the target package, not target versions which is
slightly unfortunate but might make sense. Maybe we should add
a version that matches Versions instead.
Diffstat (limited to 'apt-pkg')
-rw-r--r-- | apt-pkg/cachefilter-patterns.cc | 29 | ||||
-rw-r--r-- | apt-pkg/cachefilter-patterns.h | 22 |
2 files changed, 51 insertions, 0 deletions
diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc index fded7d92f..4a99635db 100644 --- a/apt-pkg/cachefilter-patterns.cc +++ b/apt-pkg/cachefilter-patterns.cc @@ -28,6 +28,17 @@ static const constexpr struct {"M"_sv, "?automatic"_sv, false}, {"b"_sv, "?broken"_sv, false}, {"c"_sv, "?config-files"_sv, false}, + // FIXME: The words after ~D should be case-insensitive + {"DDepends:"_sv, "?depends"_sv, true}, + {"DPre-Depends:"_sv, "?pre-depends"_sv, true}, + {"DSuggests:"_sv, "?suggests"_sv, true}, + {"DRecommends:"_sv, "?recommends"_sv, true}, + {"DConflicts:"_sv, "?conflicts"_sv, true}, + {"DReplaces:"_sv, "?replaces"_sv, true}, + {"DObsoletes:"_sv, "?obsoletes"_sv, true}, + {"DBreaks:"_sv, "?breaks"_sv, true}, + {"DEnhances:"_sv, "?enhances"_sv, true}, + {"D"_sv, "?depends"_sv, true}, {"E"_sv, "?essential"_sv, false}, {"F"_sv, "?false"_sv, false}, {"g"_sv, "?garbage"_sv, false}, @@ -418,6 +429,24 @@ std::unique_ptr<APT::CacheFilter::Matcher> PatternParser::aPattern(std::unique_p return std::make_unique<Patterns::PackageIsBroken>(file); if (node->matches("?config-files", 0, 0)) return std::make_unique<Patterns::PackageIsConfigFiles>(); + if (node->matches("?depends", 1, 1)) + return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0])); + if (node->matches("?predepends", 1, 1)) + return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::PreDepends); + if (node->matches("?suggests", 1, 1)) + return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Suggests); + if (node->matches("?recommends", 1, 1)) + return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Recommends); + if (node->matches("?conflicts", 1, 1)) + return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Conflicts); + if (node->matches("?replaces", 1, 1)) + return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Replaces); + if (node->matches("?obsoletes", 1, 1)) + return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Obsoletes); + if (node->matches("?breaks", 1, 1)) + return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::DpkgBreaks); + if (node->matches("?enhances", 1, 1)) + return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Enhances); if (node->matches("?essential", 0, 0)) return std::make_unique<Patterns::PackageIsEssential>(); if (node->matches("?exact-name", 1, 1)) diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h index d64bc4ccf..048c7041f 100644 --- a/apt-pkg/cachefilter-patterns.h +++ b/apt-pkg/cachefilter-patterns.h @@ -295,6 +295,28 @@ struct APT_HIDDEN VersionIsAllVersions : public Matcher } }; +struct APT_HIDDEN VersionDepends : public VersionAnyMatcher +{ + std::unique_ptr<APT::CacheFilter::Matcher> base; + pkgCache::Dep::DepType type; + VersionDepends(std::unique_ptr<APT::CacheFilter::Matcher> base, pkgCache::Dep::DepType type = pkgCache::Dep::Depends) : base(std::move(base)), type(type) {} + bool operator()(pkgCache::GrpIterator const &) override { return false; } + bool operator()(pkgCache::VerIterator const &Ver) override + { + for (auto D = Ver.DependsList(); not D.end(); D++) + { + if (D.IsImplicit()) + continue; + if (D->Type != type) + continue; + if ((*base)(D.TargetPkg())) + return true; + } + + return false; + } +}; + struct APT_HIDDEN VersionIsAnyVersion : public VersionAnyMatcher { std::unique_ptr<APT::CacheFilter::Matcher> base; |