Kaynağa Gözat

Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

Michael Vogt 12 yıl önce
ebeveyn
işleme
32854ff695
1 değiştirilmiş dosya ile 3 ekleme ve 0 silme
  1. 3 0
      apt-pkg/cacheset.cc

+ 3 - 0
apt-pkg/cacheset.cc

@@ -312,6 +312,9 @@ bool PackageContainerInterface::FromString(PackageContainerInterface * const pci
 
 
 	if (FromGroup(pci, Cache, str, helper) == false &&
 	if (FromGroup(pci, Cache, str, helper) == false &&
 		 FromTask(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)
 		 FromRegEx(pci, Cache, str, helper) == false)
 	{
 	{
 		helper.canNotFindPackage(pci, Cache, str);
 		helper.canNotFindPackage(pci, Cache, str);