merge from lp:~mvo/apt/mvo

[apt.git] / methods / mirror.h

diff --git a/methods/mirror.h b/methods/mirror.h
index ed817806bd70b0a57b583a7074c91f737a69f842..97d18144a49bfbc64440941c58fc6f3b6ea54344 100644 (file)
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -26,15 +26,20 @@ 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

+   string Dist;       // the target distrubtion (e.g. sid, oneiric)

 
    bool Debug;
 
  protected:
    bool DownloadMirrorFile(string uri);
 
    bool Debug;
 
  protected:
    bool DownloadMirrorFile(string uri);

+   bool RandomizeMirrorFile(string file);

    string GetMirrorFileName(string uri);
    string GetMirrorFileName(string uri);

-   bool SelectMirror();
+   bool InitMirrors();
+   bool TryNextMirror();
+   void CurrentQueueUriToMirror();

    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