* methods/mirror.cc:

  - include the architecture(s) in the query string as well so
    that the server can make better decisions

diff --git a/debian/changelog b/debian/changelog
index db80c14ef9c36632ab8ea1c175438a28c45e0296..3d9bdb31f1f05759b78dffc958a0dee0f9580740 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ apt (0.8.16~exp5) experimental; urgency=low
       like the translations index
   * apt-pkg/acquire.cc:
     - fix potential divide-by-zero
       like the translations index
   * apt-pkg/acquire.cc:
     - fix potential divide-by-zero

+  * methods/mirror.cc:
+    - include the architecture(s) in the query string as well so 
+      that the server can make better decisions

 
  -- Michael Vogt <mvo@debian.org>  Fri, 05 Aug 2011 10:57:08 +0200
 
 
  -- Michael Vogt <mvo@debian.org>  Fri, 05 Aug 2011 10:57:08 +0200
 

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 713dc211a1c8ecd103502ad4f419645749126c1c..7f28c04cbecf82079e0fa97945dcf2cc0a4f785c 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -8,6 +8,7 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <apt-pkg/aptconfiguration.h>

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/acquire-item.h>


@@ -134,9 +135,24 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 

+#if 0 // no need for this, the getArchitectures() will also include the main 
+      // arch
+   // append main architecture
+   fetch += "?arch=" + _config->Find("Apt::Architecture");
+#endif
+
+   // append all architectures
+   std::vector<std::string> vec = APT::Configuration::getArchitectures();
+   for (std::vector<std::string>::const_iterator I = vec.begin();
+        I != vec.end(); I++)
+      if (I == vec.begin())
+         fetch += "?arch" + (*I);
+      else
+         fetch += "&arch=" + (*I);
+

    // append the dist as a query string
    if (Dist != "")
    // append the dist as a query string
    if (Dist != "")

-      fetch += "?dist=" + Dist;
+      fetch += "&dist=" + Dist;

 
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"
 
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"