fix testcase framework to test correctly for virtual packages

[apt.git] / methods / mirror.cc

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 4d767c9f3eff80ce3a84378b11d9897208fcb220..e8873d97b099f892c5d636d44982760ecd683d0d 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -106,7 +106,7 @@ bool MirrorMethod::Clean(string Dir)
       for(I=list.begin(); I != list.end(); I++)
       {
         string uri = (*I)->GetURI();
-        if(uri.substr(0,strlen("mirror://")) != string("mirror://"))
+        if(uri.find("mirror://") != 0)
            continue;
         string BaseUri = uri.substr(0,uri.size()-1);
         if (URItoFileName(BaseUri) == Dir->d_name)
@@ -142,13 +142,51 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    return res;
 }
 
-bool MirrorMethod::SelectNextMirror()
+/* convert a the Queue->Uri back to the mirror base uri and look
+ * at all mirrors we have for this, this is needed as queue->uri
+ * may point to different mirrors (if TryNextMirror() was run)
+ */
+void MirrorMethod::CurrentQueueUriToMirror()
 {
-   if(Debug)
-      cerr << "using mirror: " << Mirror << endl;
+   // already in mirror:// style so nothing to do
+   if(Queue->Uri.find("mirror://") == 0)
+      return;
+
+   // find current mirror and select next one
+   for (vector<string>::const_iterator mirror = AllMirrors.begin();
+       mirror != AllMirrors.end(); ++mirror)
+   {
+      if (Queue->Uri.find(*mirror) == 0)
+      {
+        Queue->Uri.replace(0, mirror->length(), BaseUri);
+        return;
+      }
+   }
+   _error->Error("Internal error: Failed to convert %s back to %s",
+                Queue->Uri.c_str(), BaseUri.c_str());
+}
+
+bool MirrorMethod::TryNextMirror()
+{
+   // find current mirror and select next one
+   for (vector<string>::const_iterator mirror = AllMirrors.begin();
+       mirror != AllMirrors.end(); ++mirror)
+   {
+      if (Queue->Uri.find(*mirror) != 0)
+        continue;
+
+      vector<string>::const_iterator nextmirror = mirror + 1;
+      if (nextmirror != AllMirrors.end())
+        break;
+      Queue->Uri.replace(0, mirror->length(), *nextmirror);
+      if (Debug)
+        clog << "TryNextMirror: " << Queue->Uri << endl;
+      return true;
+   }
+
+   if (Debug)
+      clog << "TryNextMirror could not find another mirror to try" << endl;
 
-   Mirror = AllMirrors[0];
-   UsedMirror = Mirror;
    return false;
 }
 
@@ -176,7 +214,8 @@ bool MirrorMethod::InitMirrors()
       if (s.size() > 0)
         AllMirrors.push_back(s);
    }
-   SelectNextMirror();
+   Mirror = AllMirrors[0];
+   UsedMirror = Mirror;
    return true;
 }
 
@@ -267,7 +306,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
       DownloadMirrorFile(Itm->Uri);
    }
 
-   if(Mirror.empty()) {
+   if(AllMirrors.empty()) {
       if(!InitMirrors()) {
         // no valid mirror selected, something went wrong downloading
         // from the master mirror site most likely and there is
@@ -275,15 +314,12 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
         return false;
       }
    }
-   if(Debug)
-      clog << "selected mirror: " << Mirror << endl;
 
+   if(Itm->Uri.find("mirror://") != string::npos)
+      Itm->Uri.replace(0,BaseUri.size(), Mirror);
 
-   for (FetchItem *I = Queue; I != 0; I = I->Next)
-   {
-      if(I->Uri.find("mirror://") != string::npos)
-        I->Uri.replace(0,BaseUri.size(), Mirror);
-   }
+   if(Debug)
+      clog << "Fetch: " << Itm->Uri << endl << endl;
    
    // now run the real fetcher
    return HttpMethod::Fetch(Itm);
@@ -291,35 +327,35 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
 
 void MirrorMethod::Fail(string Err,bool Transient)
 {
-   // try the next mirror on fail
-   string old_mirror = Mirror;
-   if (SelectNextMirror()) 
-   {
-      Queue->Uri.replace(0, old_mirror.size(), Mirror);
+   // FIXME: TryNextMirror is not ideal for indexfile as we may
+   //        run into auth issues
+
+   if (Debug)
+      clog << "Failure to get " << Queue->Uri << endl;
+
+   // try the next mirror on fail (if its not a expected failure,
+   // e.g. translations are ok to ignore)
+   if (!Queue->FailIgnore && TryNextMirror()) 
       return;
-   }
 
    // all mirrors failed, so bail out
    string s;
    strprintf(s, _("[Mirror: %s]"), Mirror.c_str());
    SetIP(s);
 
-   if(Queue->Uri.find("http://") != string::npos)
-      Queue->Uri.replace(0,Mirror.size(), BaseUri);
+   CurrentQueueUriToMirror();
    pkgAcqMethod::Fail(Err, Transient);
 }
 
 void MirrorMethod::URIStart(FetchResult &Res)
 {
-   if(Queue->Uri.find("http://") != string::npos)
-      Queue->Uri.replace(0,Mirror.size(), BaseUri);
+   CurrentQueueUriToMirror();
    pkgAcqMethod::URIStart(Res);
 }
 
 void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt)
 {
-   if(Queue->Uri.find("http://") != string::npos)
-      Queue->Uri.replace(0,Mirror.size(), BaseUri);
+   CurrentQueueUriToMirror();
    pkgAcqMethod::URIDone(Res, Alt);
 }