diff options
| -rw-r--r-- | apt-pkg/cachefilter.h | 61 | ||||
| -rw-r--r-- | apt-private/private-list.cc | 8 | ||||
| -rw-r--r-- | debian/changelog | 7 |
3 files changed, 3 insertions, 73 deletions
diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index 34b7d0b46..8e8776ed9 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -15,66 +15,6 @@ namespace APT { namespace CacheFilter { -#define PACKAGE_MATCHER_ABI_COMPAT 1 -#ifdef PACKAGE_MATCHER_ABI_COMPAT - -// PackageNameMatchesRegEx /*{{{*/ -class PackageNameMatchesRegEx { - /** \brief dpointer placeholder (for later in case we need it) */ - void *d; - regex_t* pattern; -public: - PackageNameMatchesRegEx(std::string const &Pattern); - bool operator() (pkgCache::PkgIterator const &Pkg); - bool operator() (pkgCache::GrpIterator const &Grp); - ~PackageNameMatchesRegEx(); -}; - /*}}}*/ -// PackageNameMatchesFnmatch /*{{{*/ - class PackageNameMatchesFnmatch { - /** \brief dpointer placeholder (for later in case we need it) */ - void *d; - const std::string Pattern; -public: - PackageNameMatchesFnmatch(std::string const &Pattern) - : Pattern(Pattern) {}; - bool operator() (pkgCache::PkgIterator const &Pkg); - bool operator() (pkgCache::GrpIterator const &Grp); - ~PackageNameMatchesFnmatch() {}; -}; - /*}}}*/ -// PackageArchitectureMatchesSpecification /*{{{*/ -/** \class PackageArchitectureMatchesSpecification - \brief matching against architecture specification strings - - The strings are of the format <kernel>-<cpu> where either component, - or the whole string, can be the wildcard "any" as defined in - debian-policy ยง11.1 "Architecture specification strings". - - Examples: i386, mipsel, linux-any, any-amd64, any */ -class PackageArchitectureMatchesSpecification { - std::string literal; - std::string complete; - bool isPattern; - /** \brief dpointer placeholder (for later in case we need it) */ - void *d; -public: - /** \brief matching against architecture specification strings - * - * @param pattern is the architecture specification string - * @param isPattern defines if the given \b pattern is a - * architecture specification pattern to match others against - * or if it is the fixed string and matched against patterns - */ - PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true); - bool operator() (char const * const &arch); - bool operator() (pkgCache::PkgIterator const &Pkg); - bool operator() (pkgCache::VerIterator const &Ver); - ~PackageArchitectureMatchesSpecification(); -}; - -#else - class PackageMatcher { public: virtual bool operator() (pkgCache::PkgIterator const &Pkg) { return false; }; @@ -138,7 +78,6 @@ public: virtual bool operator() (pkgCache::VerIterator const &Ver); virtual ~PackageArchitectureMatchesSpecification(); }; -#endif /*}}}*/ } } diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index c3a21aafc..bbf4607f9 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -53,9 +53,6 @@ struct PackageSortAlphabetic } }; -#ifdef PACKAGE_MATCHER_ABI_COMPAT -#define PackageMatcher PackageNameMatchesFnmatch -#endif class PackageNameMatcher : public Matcher { public: @@ -64,16 +61,11 @@ class PackageNameMatcher : public Matcher for(int i=0; patterns[i] != NULL; i++) { std::string pattern = patterns[i]; -#ifdef PACKAGE_MATCHER_ABI_COMPAT - APT::CacheFilter::PackageNameMatchesFnmatch *cachefilter = NULL; - cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern); -#else APT::CacheFilter::PackageMatcher *cachefilter = NULL; if(_config->FindB("APT::Cmd::UseRegexp", false) == true) cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern); else cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern); -#endif filters.push_back(cachefilter); } } diff --git a/debian/changelog b/debian/changelog index af75ee757..06520b748 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,4 @@ -<<<<<<< HEAD -apt (0.9.10~exp1) UNRELEASED; urgency=low +apt (0.9.11~exp1) UNRELEASED; urgency=low [ Michael Vogt ] * lp:~mvo/apt/webserver-simulate-broken-with-fix346386: @@ -14,9 +13,10 @@ apt (0.9.10~exp1) UNRELEASED; urgency=low * use sha512 when available (LP: #1098752) * [ABI-Break] lp:~mvo/apt/source-hashes: - use sha{512,256,1} for deb-src when available LP: #1098738 + * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines -- Michael Vogt <mvo@debian.org> Fri, 01 Mar 2013 12:12:39 +0100 -======= + apt (0.9.11) UNRELEASED; urgency=low The "Happy 20th Birthday Debian" upload @@ -48,7 +48,6 @@ apt (0.9.11) UNRELEASED; urgency=low * French translation update. -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Aug 2013 09:27:35 +0200 ->>>>>>> debian/sid apt (0.9.10) unstable; urgency=low |