methods/mirror.cc: improve debug output and fix selecting the next mirror

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

diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index fe264aa463688ff9cfa47f79225bf8345eb988cc..39639a23dc3dd565126b008ada319074764921ae 100644 (file)
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -3,29 +3,33 @@
 // $Id: versionmatch.h,v 1.4 2001/05/29 03:07:12 jgg Exp $
 /* ######################################################################
 
 // $Id: versionmatch.h,v 1.4 2001/05/29 03:07:12 jgg Exp $
 /* ######################################################################
 

-   Version Matching 
-   
+   Version Matching
+

    This module takes a matching string and a type and locates the version
    record that satisfies the constraint described by the matching string.
 
      Version: 1.2*
      Release: o=Debian,v=2.1*,c=main
      Release: v=2.1*
    This module takes a matching string and a type and locates the version
    record that satisfies the constraint described by the matching string.
 
      Version: 1.2*
      Release: o=Debian,v=2.1*,c=main
      Release: v=2.1*

+     Release: a=testing
+     Release: n=squeeze

      Release: *
      Origin: ftp.debian.org
      Release: *
      Origin: ftp.debian.org

-   
+

    Release may be a complex type that can specify matches for any of:
       Version (v= with prefix)
       Origin (o=)
    Release may be a complex type that can specify matches for any of:
       Version (v= with prefix)
       Origin (o=)

-      Archive (a=)
+      Archive (a=) eg, unstable, testing, stable
+      Codename (n=) e.g. etch, lenny, squeeze, sid

       Label (l=)
       Component (c=)
       Label (l=)
       Component (c=)

+      Binary Architecture (b=)

    If there are no equals signs in the string then it is scanned in short
    If there are no equals signs in the string then it is scanned in short

-   form - if it starts with a number it is Version otherwise it is an 
-   Archive.
-   
+   form - if it starts with a number it is Version otherwise it is an
+   Archive or a Codename.
+

    Release may be a '*' to match all releases.
    Release may be a '*' to match all releases.

-   
+

    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_VERSIONMATCH_H
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef PKGLIB_VERSIONMATCH_H


@@ -47,9 +51,12 @@ class pkgVersionMatch
    string RelVerStr;
    bool RelVerPrefixMatch;
    string RelOrigin;
    string RelVerStr;
    bool RelVerPrefixMatch;
    string RelOrigin;

+   string RelRelease;
+   string RelCodename;

    string RelArchive;
    string RelLabel;
    string RelComponent;
    string RelArchive;
    string RelLabel;
    string RelComponent;

+   string RelArchitecture;

    bool MatchAll;
    
    // Origin Matching
    bool MatchAll;
    
    // Origin Matching


@@ -60,6 +67,8 @@ class pkgVersionMatch
    enum MatchType {None = 0,Version,Release,Origin} Type;
    
    bool MatchVer(const char *A,string B,bool Prefix);
    enum MatchType {None = 0,Version,Release,Origin} Type;
    
    bool MatchVer(const char *A,string B,bool Prefix);

+   bool ExpressionMatches(const char *pattern, const char *string);
+   bool ExpressionMatches(const std::string& pattern, const char *string);

    bool FileMatch(pkgCache::PkgFileIterator File);
    pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);
                               
    bool FileMatch(pkgCache::PkgFileIterator File);
    pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);