diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-12-14 02:38:34 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-12-14 02:38:34 +0100 |
| commit | 27e4c1664a93bdce20de62a984e51d56671690ce (patch) | |
| tree | 36e110b4ba73db204af7a9efb924032b7f1776c4 | |
| parent | bd4a8f51649ee37291c6e07310104a94f4f5fbed (diff) | |
support regex and co in 'apt-cache policy $pkg' again
Regression of 1e064088bf7b3e29cd36d30760fb3e4143a1a49a (1.1~exp4) which
moved code around and renamed methods heavily ending up calling the
wrong method matching packagenames only instead of calling the full
array. Most commands work with versions, so this managed to fly under
the radar for quite a while.
Closes: 807870
| -rw-r--r-- | apt-pkg/cacheset.cc | 2 | ||||
| -rwxr-xr-x | test/integration/test-policy-pinning | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index db34c4a20..816925c4d 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -336,7 +336,7 @@ bool CacheSetHelper::PackageFromString(PackageContainerInterface * const pci, pk bool CacheSetHelper::PackageFromCommandLine(PackageContainerInterface * const pci, pkgCacheFile &Cache, const char **cmdline) { bool found = false; for (const char **I = cmdline; *I != 0; ++I) - found |= PackageFrom(CacheSetHelper::PACKAGENAME, pci, Cache, *I); + found |= PackageFrom(CacheSetHelper::STRING, pci, Cache, *I); return found; } /*}}}*/ diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning index dba873656..062c8058f 100755 --- a/test/integration/test-policy-pinning +++ b/test/integration/test-policy-pinning @@ -83,6 +83,15 @@ buildsimplenativepackage "coolstuff" "all" "2.0~bpo1" "backports" setupaptarchive +testsuccessequal "coolstuff: + Installed: (none) + Candidate: 2.0~bpo1 + Version table: + 2.0~bpo1 500 + 500 file:${APTARCHIVE} backports/main all Packages + 1.0 500 + 500 file:${APTARCHIVE} stable/main all Packages" apt policy '^cool.*' + testequalpolicycoolstuff() { local INSTALLED="${1:-(none)}" local CANDIDATE="${2:-(none)}" |