merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

[apt.git] / apt-pkg / cachefilter.h

diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index e7ab1723fe992e0b54e4e49b1be06d3053688aae..25cd43f476136dd7fd95418055e29e0b8c128031 100644 (file)
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -16,6 +16,8 @@ namespace APT {
 namespace CacheFilter {
 // PackageNameMatchesRegEx                                             /*{{{*/
 class PackageNameMatchesRegEx {
 namespace CacheFilter {
 // PackageNameMatchesRegEx                                             /*{{{*/
 class PackageNameMatchesRegEx {

+         /** \brief dpointer placeholder (for later in case we need it) */
+         void *d;

        regex_t* pattern;
 public:
        PackageNameMatchesRegEx(std::string const &Pattern);
        regex_t* pattern;
 public:
        PackageNameMatchesRegEx(std::string const &Pattern);


@@ -24,6 +26,36 @@ public:
        ~PackageNameMatchesRegEx();
 };
                                                                        /*}}}*/
        ~PackageNameMatchesRegEx();
 };
                                                                        /*}}}*/

+// 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();
+};
+                                                                       /*}}}*/

 }
 }
 #endif
 }
 }
 #endif