From 9282c9094ab3e77cebe90e97b2f9a5fc21463e2f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 15 Aug 2019 13:32:54 +0200 Subject: Add ?broken pattern This matches all packages that have broken dependencies in the installed version or the version selected for install. --- apt-pkg/cachefilter-patterns.cc | 2 ++ apt-pkg/cachefilter-patterns.h | 12 ++++++++++++ doc/apt-patterns.7.xml | 3 +++ test/integration/test-apt-patterns | 3 +++ 4 files changed, 20 insertions(+) diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc index 0f23890b4..a180cf78e 100644 --- a/apt-pkg/cachefilter-patterns.cc +++ b/apt-pkg/cachefilter-patterns.cc @@ -212,6 +212,8 @@ std::unique_ptr PatternParser::aPattern(std::unique_p return std::make_unique(aWord(node->arguments[0])); if (node->matches("?automatic", 0, 0)) return std::make_unique(file); + if (node->matches("?broken", 0, 0)) + return std::make_unique(file); if (node->matches("?config-files", 0, 0)) return std::make_unique(); if (node->matches("?false", 0, 0)) diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h index 7770385c9..c219e5bcd 100644 --- a/apt-pkg/cachefilter-patterns.h +++ b/apt-pkg/cachefilter-patterns.h @@ -128,6 +128,18 @@ struct PackageIsAutomatic : public PackageMatcher } }; +struct PackageIsBroken : public PackageMatcher +{ + pkgCacheFile *Cache; + explicit PackageIsBroken(pkgCacheFile *Cache) : Cache(Cache) {} + bool operator()(pkgCache::PkgIterator const &Pkg) override + { + assert(Cache != nullptr); + auto state = (*Cache)[Pkg]; + return state.InstBroken() || state.NowBroken(); + } +}; + struct PackageIsConfigFiles : public PackageMatcher { bool operator()(pkgCache::PkgIterator const &Pkg) override diff --git a/doc/apt-patterns.7.xml b/doc/apt-patterns.7.xml index 64dad4dd4..e1c64de8e 100644 --- a/doc/apt-patterns.7.xml +++ b/doc/apt-patterns.7.xml @@ -72,6 +72,9 @@ ?automatic Selects packages that were installed automatically. + ?broken + Selects packages that have broken dependencies. + ?config-files Selects packages that are not fully installed, but have solely residual configuration files left. diff --git a/test/integration/test-apt-patterns b/test/integration/test-apt-patterns index b84605256..e566c6bd2 100755 --- a/test/integration/test-apt-patterns +++ b/test/integration/test-apt-patterns @@ -116,6 +116,9 @@ testsuccessequal "Listing... automatic1/now 1.0 i386 [installed,local] automatic2/now 1.0 i386 [installed,local]" apt list '?automatic' +testsuccessequal "Listing... +broken/now 1.0 i386 [installed,local]" apt list '?broken' + testsuccessequal "Listing... conf-only/now 1.0 i386 [residual-config]" apt list '?config-files' -- cgit v1.2.3-70-g09d2