summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-20 14:41:48 +0100
committerMichael Vogt <mvo@debian.org>2014-02-20 14:41:48 +0100
commit32854ff6954903a6562f28a325d42b9c66de23a9 (patch)
tree401d021149bd8c74bbceb2992ccd1b39ff50c173
parentc255de478459f7b5051b3394abe0b6b632c7423c (diff)
parent7e75a619f6d35c492c1341096096432109facfc5 (diff)
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
-rw-r--r--apt-pkg/cacheset.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index eab1e09f8..6b6fdb5ad 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -312,6 +312,9 @@ bool PackageContainerInterface::FromString(PackageContainerInterface * const pci
if (FromGroup(pci, Cache, str, helper) == false &&
FromTask(pci, Cache, str, helper) == false &&
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+ FromFnmatch(pci, Cache, str, helper) == false)
+#endif
FromRegEx(pci, Cache, str, helper) == false)
{
helper.canNotFindPackage(pci, Cache, str);