append the dist (e.g. sid, wheezy) as a query string when

asking for a suitable mirror

diff --git a/debian/changelog b/debian/changelog
index 9fbcf0ad6e99d7eafdd8731e8c095db5b7055fcd..dc653a0901287753c484a7ed1079bee08c086d70 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,6 +78,8 @@ apt (0.8.15) UNRELEASED; urgency=low
   * methods/mirror.cc:
     - ignore lines starting with "#" in the mirror file
     - ignore non http urls in the mirrors
+    - append the dist (e.g. sid, wheezy) as a query string when
+      asking for a suitable mirror 
 
  -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
 

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 8a7228def45c43d20ef7a081b00cc7f3aee0675c..713dc211a1c8ecd103502ad4f419645749126c1c 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -134,6 +134,10 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 
+   // append the dist as a query string
+   if (Dist != "")
+      fetch += "?dist=" + Dist;
+
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"
            << " to " << MirrorFile << endl;
@@ -339,6 +343,7 @@ string MirrorMethod::GetMirrorFileName(string mirror_uri_str)
         if(Debug)
            std::cerr << "found BaseURI: " << uristr << std::endl;
         BaseUri = uristr.substr(0,uristr.size()-1);
+         Dist = (*I)->GetDist();
       }
    }
    // get new file

diff --git a/methods/mirror.h b/methods/mirror.h
index bd807e1227c0f84b4bf92bf24753337541f2d88b..97d18144a49bfbc64440941c58fc6f3b6ea54344 100644 (file)
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -29,6 +29,7 @@ class MirrorMethod : public HttpMethod
    vector<string> AllMirrors; // all available mirrors
    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;