diff options
author | Michael Vogt <mvo@debian.org> | 2014-02-14 19:58:56 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-02-14 20:02:26 +0100 |
commit | 32611903e8dcd6599042552c6c576b70e3d6633a (patch) | |
tree | 673d645f2472ce746ae196060dad74456dd0a7c6 /apt-pkg/cacheset.cc | |
parent | 16724b66fef02208ef050a36f732991941e39025 (diff) |
disable fnmatch()
The current PackageContainerInterface::FromString() will do a
FromFnmatch() first and then FromRegEx(). This commit reverts
that change to restore the old behavior to only look for RegEx
and not glob-style pattern. The rational is that:
a) currently a fnmatch() is misleadingly reported as a regex match to
the user (Bug#738880)
b) a fnmatch may match something different than a a RegEx so the
change broke a published interface
Diffstat (limited to 'apt-pkg/cacheset.cc')
-rw-r--r-- | apt-pkg/cacheset.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 1b1e6d595..eab1e09f8 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -312,7 +312,6 @@ bool PackageContainerInterface::FromString(PackageContainerInterface * const pci if (FromGroup(pci, Cache, str, helper) == false && FromTask(pci, Cache, str, helper) == false && - FromFnmatch(pci, Cache, str, helper) == false && FromRegEx(pci, Cache, str, helper) == false) { helper.canNotFindPackage(pci, Cache, str); |