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

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

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 65908f733a771c82ce556b778f20d75d1a73ca6d..c40b1fdbc859b0875192ac79ca55a3d461fc6e43 100644 (file)
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -118,7 +118,10 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
    
    if (Type == Origin)
    {
    
    if (Type == Origin)
    {

-      OrSite = Data;
+      if (Data[0] == '"' && Data.length() >= 2 && Data.end()[-1] == '"')
+        OrSite = Data.substr(1, Data.length() - 2);
+      else
+        OrSite = Data;

       return;
    }   
 }
       return;
    }   
 }


@@ -183,11 +186,12 @@ bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string)
         char *regex = strdup(pattern + 1);
         regex[length - 2] = '\0';
         if (regcomp(&preg, regex, REG_EXTENDED | REG_ICASE) != 0) {
         char *regex = strdup(pattern + 1);
         regex[length - 2] = '\0';
         if (regcomp(&preg, regex, REG_EXTENDED | REG_ICASE) != 0) {

-           std::cerr << "E: Invalid regular expression: " << regex << "\n";
+           _error->Warning("Invalid regular expression: %s", regex);

         } else if (regexec(&preg, string, 0, NULL, 0) == 0) {
            res = true;
         }
         free(regex);
         } else if (regexec(&preg, string, 0, NULL, 0) == 0) {
            res = true;
         }
         free(regex);

+        regfree(&preg);

         return res;
       }
    }
         return res;
       }
    }


@@ -258,10 +262,10 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
    if (Type == Origin)
    {
       if (OrSite.empty() == false) {
    if (Type == Origin)
    {
       if (OrSite.empty() == false) {

-        if (File->Site == 0 || !ExpressionMatches(OrSite, File.Site()))
+        if (File->Site == 0)

            return false;
       } else // so we are talking about file:// or status file
            return false;
       } else // so we are talking about file:// or status file

-        if (strcmp(File.Site(),"") == 0 && File->Archive != 0) // skip the status file
+        if (strcmp(File.Site(),"") == 0 && File->Archive != 0 && strcmp(File.Archive(),"now") == 0) // skip the status file

            return false;
       return (ExpressionMatches(OrSite, File.Site())); /* both strings match */
    }
            return false;
       return (ExpressionMatches(OrSite, File.Site())); /* both strings match */
    }