* apt-pkg/deb/dpkgpm.cc:

  - add missing include
* methods/mirror.{cc,h}:
  - add SelectNextMirror() and InitMirrors() functions
  - read all mirrors into the AllMirrors vector

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 18c731788f2a3a020f07dcf80d138334248fb898..7e5171eda3b548fd7ee98905f6a7e88bd2b2c484 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <sys/select.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <sys/select.h>

+#include <sys/stat.h>

 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>

diff --git a/methods/mirror.cc b/methods/mirror.cc
index b3a956b95488f87adf56d1c7a0030ccbf76db604..0a0d07e6b381af72df35b81034e06027f85c372f 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -162,7 +162,21 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    return res;
 }
 
    return res;
 }
 

-bool MirrorMethod::SelectMirror()
+bool MirrorMethod::SelectNextMirror()
+{
+   if (AllMirrors.size() < 1)
+      return false;
+
+   Mirror = AllMirrors[0];
+   AllMirrors.erase(AllMirrors.begin());
+   if(Debug)
+      cerr << "using mirror: " << Mirror << endl;
+
+   UsedMirror = Mirror;
+   return true;
+}
+
+bool MirrorMethod::InitMirrors()

 {
    // if we do not have a MirrorFile, fallback
    if(!FileExists(MirrorFile))
 {
    // if we do not have a MirrorFile, fallback
    if(!FileExists(MirrorFile))


@@ -179,11 +193,13 @@ bool MirrorMethod::SelectMirror()
    //      get into sync issues (got indexfiles from mirror A,
    //      but packages from mirror B - one might be out of date etc)
    ifstream in(MirrorFile.c_str());
    //      get into sync issues (got indexfiles from mirror A,
    //      but packages from mirror B - one might be out of date etc)
    ifstream in(MirrorFile.c_str());

-   getline(in, Mirror);
-   if(Debug)
-      cerr << "Using mirror: " << Mirror << endl;
-
-   UsedMirror = Mirror;
+   string s;
+   while (!in.eof()) 
+   {
+      getline(in, s);
+      AllMirrors.push_back(s);
+   }
+   SelectNextMirror();

    return true;
 }
 
    return true;
 }
 


@@ -275,7 +291,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
    }
 
    if(Mirror.empty()) {
    }
 
    if(Mirror.empty()) {

-      if(!SelectMirror()) {
+      if(!InitMirrors()) {

         // no valid mirror selected, something went wrong downloading
         // from the master mirror site most likely and there is
         // no old mirror file availalbe
         // no valid mirror selected, something went wrong downloading
         // from the master mirror site most likely and there is
         // no old mirror file availalbe

diff --git a/methods/mirror.h b/methods/mirror.h
index ed817806bd70b0a57b583a7074c91f737a69f842..1b506dc871c64705c5be8bcf5a825a2f0fcf9195 100644 (file)
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -26,6 +26,7 @@ class MirrorMethod : public HttpMethod
    // we simply transform between BaseUri and Mirror
    string BaseUri;    // the original mirror://... url
    string Mirror;     // the selected mirror uri (http://...)
    // we simply transform between BaseUri and Mirror
    string BaseUri;    // the original mirror://... url
    string Mirror;     // the selected mirror uri (http://...)

+   vector<string> AllMirrors; // all available mirrors

    string MirrorFile; // the file that contains the list of mirrors
    bool DownloadedMirrorFile; // already downloaded this session
 
    string MirrorFile; // the file that contains the list of mirrors
    bool DownloadedMirrorFile; // already downloaded this session
 


@@ -34,7 +35,8 @@ class MirrorMethod : public HttpMethod
  protected:
    bool DownloadMirrorFile(string uri);
    string GetMirrorFileName(string uri);
  protected:
    bool DownloadMirrorFile(string uri);
    string GetMirrorFileName(string uri);

-   bool SelectMirror();
+   bool InitMirrors();
+   bool SelectNextMirror();

    bool Clean(string dir);
    
    // we need to overwrite those to transform the url back
    bool Clean(string dir);
    
    // we need to overwrite those to transform the url back