diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-10-05 15:21:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-10-05 15:21:47 +0200 |
| commit | 6f2f5f4afa6f628ad3d068e9ba55fc6455eefa12 (patch) | |
| tree | d360bbbdff678c19142facabc46f30f693fe32e9 /apt-pkg/cacheset.cc | |
| parent | 1f5a2d63b784eb919143d0be3f2dee7ff0bb7e83 (diff) | |
| parent | 56e47f3111ad714c6506c0d60dccb92cfc9311cb (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'apt-pkg/cacheset.cc')
| -rw-r--r-- | apt-pkg/cacheset.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 74837dcb9..760a744f2 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -212,7 +212,7 @@ PackageContainerInterface::FromFnmatch(PackageContainerInterface * const pci, } pci->insert(Pkg); -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) helper.showFnmatchSelection(Pkg, pattern); #else helper.showRegExSelection(Pkg, pattern); @@ -221,7 +221,7 @@ PackageContainerInterface::FromFnmatch(PackageContainerInterface * const pci, } if (found == false) { -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) helper.canNotFindFnmatch(pci, Cache, pattern); #else helper.canNotFindRegEx(pci, Cache, pattern); @@ -320,7 +320,7 @@ 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) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) FromFnmatch(pci, Cache, str, helper) == false && #endif FromRegEx(pci, Cache, str, helper) == false) @@ -608,7 +608,7 @@ void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const /*pci*/, if (ShowError == true) _error->Insert(ErrorType, _("Couldn't find any package by regex '%s'"), pattern.c_str()); } -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) // canNotFindFnmatch - handle the case no package is found by a fnmatch /*{{{*/ void CacheSetHelper::canNotFindFnmatch(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) { if (ShowError == true) @@ -674,7 +674,7 @@ APT_CONST void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &/ std::string const &/*pattern*/) { } /*}}}*/ -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) // showFnmatchSelection /*{{{*/ APT_CONST void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern) { |