* debian/apt-utils.links:

[apt.git] / methods / mirror.cc

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

+#include <config.h>
+
+#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>


@@ -15,7 +18,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/sourcelist.h>

-
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/metaindex.h>

 
 #include <algorithm>
 #include <fstream>
 
 #include <algorithm>
 #include <fstream>


@@ -33,7 +37,7 @@ using namespace std;
 
 #include "mirror.h"
 #include "http.h"
 
 #include "mirror.h"
 #include "http.h"

-#include "apti18n.h"
+#include <apti18n.h>

                                                                        /*}}}*/
 
 /* Done:
                                                                        /*}}}*/
 
 /* Done:


@@ -54,7 +58,7 @@ using namespace std;
  */
 
 MirrorMethod::MirrorMethod()
  */
 
 MirrorMethod::MirrorMethod()

-   : HttpMethod(), DownloadedMirrorFile(false)
+   : HttpMethod(), DownloadedMirrorFile(false), Debug(false)

 {
 };
 
 {
 };
 


@@ -107,7 +111,7 @@ bool MirrorMethod::Clean(string Dir)
         continue;
 
       // see if we have that uri
         continue;
 
       // see if we have that uri

-      for(I=list.begin(); I != list.end(); I++)
+      for(I=list.begin(); I != list.end(); ++I)

       {
         string uri = (*I)->GetURI();
         if(uri.find("mirror://") != 0)
       {
         string uri = (*I)->GetURI();
         if(uri.find("mirror://") != 0)


@@ -120,9 +124,10 @@ bool MirrorMethod::Clean(string Dir)
       if (I == list.end())
         unlink(Dir->d_name);
    };
       if (I == list.end())
         unlink(Dir->d_name);
    };

-   
-   chdir(StartDir.c_str());
+

    closedir(D);
    closedir(D);

+   if (chdir(StartDir.c_str()) != 0)
+      return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());

    return true;   
 }
 
    return true;   
 }
 


@@ -134,9 +139,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 << "'"


@@ -330,7 +350,7 @@ string MirrorMethod::GetMirrorFileName(string mirror_uri_str)
    vector<metaIndex *>::const_iterator I;
    pkgSourceList list;
    list.ReadMainList();
    vector<metaIndex *>::const_iterator I;
    pkgSourceList list;
    list.ReadMainList();

-   for(I=list.begin(); I != list.end(); I++)
+   for(I=list.begin(); I != list.end(); ++I)

    {
       string uristr = (*I)->GetURI();
       if(Debug)
    {
       string uristr = (*I)->GetURI();
       if(Debug)