Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

[apt.git] / methods / mirror.cc

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 2cf5c9ce1110a9d7f9b259cf9913451b89126d94..d3aef91bcd3d68054a96754152f418b463d09d8f 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -3,27 +3,31 @@
 // $Id: mirror.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
 /* ######################################################################
 
 // $Id: mirror.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
 /* ######################################################################
 

-   Mirror Aquire Method - This is the Mirror aquire method for APT.
+   Mirror Acquire Method - This is the Mirror acquire method for APT.

    
    ##################################################################### */
                                                                        /*}}}*/
 // 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/acquire.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/hashes.h>

 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/sourcelist.h>

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

 
 

-
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>

 #include <algorithm>
 #include <algorithm>

-#include <fstream>

 #include <iostream>
 #include <iostream>

-
-#include <stdarg.h>
+#include <fstream>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <sys/types.h>

 #include <sys/utsname.h>
 #include <dirent.h>
 
 #include <sys/utsname.h>
 #include <dirent.h>
 


@@ -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:


@@ -45,7 +49,7 @@ using namespace std;
  *   of the failure that is also send to LP
  * 
  * TODO: 
  *   of the failure that is also send to LP
  * 
  * TODO: 

- * - deal with runing as non-root because we can't write to the lists 
+ * - deal with running as non-root because we can't write to the lists

      dir then -> use the cached mirror file
  * - better method to download than having a pkgAcquire interface here
  *   and better error handling there!
      dir then -> use the cached mirror file
  * - better method to download than having a pkgAcquire interface here
  *   and better error handling there!


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

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

 {
 {

-};
+}

 
 // HttpMethod::Configuration - Handle a configuration message          /*{{{*/
 // ---------------------------------------------------------------------
 
 // HttpMethod::Configuration - Handle a configuration message          /*{{{*/
 // ---------------------------------------------------------------------


@@ -86,17 +90,17 @@ bool MirrorMethod::Clean(string Dir)
    pkgSourceList list;
    list.ReadMainList();
 
    pkgSourceList list;
    list.ReadMainList();
 

-   DIR *D = opendir(Dir.c_str());   
+   DIR *D = opendir(Dir.c_str());

    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());

-   
+

    string StartDir = SafeGetCWD();
    if (chdir(Dir.c_str()) != 0)
    {
       closedir(D);
       return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str());
    }
    string StartDir = SafeGetCWD();
    if (chdir(Dir.c_str()) != 0)
    {
       closedir(D);
       return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str());
    }

-   
+

    for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
    {
       // Skip some files..
    for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
    {
       // Skip some files..


@@ -107,10 +111,10 @@ 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();
       {
         string uri = (*I)->GetURI();

-        if(uri.find("mirror://") != 0)
+        if(uri.compare(0, strlen("mirror://"), "mirror://") != 0)

            continue;
         string BaseUri = uri.substr(0,uri.size()-1);
         if (URItoFileName(BaseUri) == Dir->d_name)
            continue;
         string BaseUri = uri.substr(0,uri.size()-1);
         if (URItoFileName(BaseUri) == Dir->d_name)


@@ -119,21 +123,41 @@ bool MirrorMethod::Clean(string Dir)
       // nothing found, nuke it
       if (I == list.end())
         unlink(Dir->d_name);
       // nothing found, nuke it
       if (I == list.end())
         unlink(Dir->d_name);

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

    closedir(D);
    closedir(D);

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

 }
 
 
 }
 
 

-bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
+bool MirrorMethod::DownloadMirrorFile(string /*mirror_uri_str*/)

 {
 {

-   // not that great to use pkgAcquire here, but we do not have 
+   // not that great to use pkgAcquire here, but we do not have

    // any other way right now
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 
    // any other way right now
    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 != "")
+      fetch += "&dist=" + Dist;
+

    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"
            << " to " << MirrorFile << endl;
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"
            << " to " << MirrorFile << endl;


@@ -149,7 +173,7 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
 
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile() success: " << res << endl;
 
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile() success: " << res << endl;

-   
+

    return res;
 }
 
    return res;
 }
 


@@ -163,20 +187,20 @@ bool MirrorMethod::RandomizeMirrorFile(string mirror_file)
    if (!FileExists(mirror_file))
       return false;
 
    if (!FileExists(mirror_file))
       return false;
 

-   // read 
+   // read

    ifstream in(mirror_file.c_str());
    while ( !in.eof() ) {
       getline(in, line);
       content.push_back(line);
    }
    ifstream in(mirror_file.c_str());
    while ( !in.eof() ) {
       getline(in, line);
       content.push_back(line);
    }

-   
+

    // we want the file to be random for each different machine, but also
    // "stable" on the same machine. this is to avoid running into out-of-sync
    // issues (i.e. Release/Release.gpg different on each mirror)
    struct utsname buf;
    // we want the file to be random for each different machine, but also
    // "stable" on the same machine. this is to avoid running into out-of-sync
    // issues (i.e. Release/Release.gpg different on each mirror)
    struct utsname buf;

-   int seed=1, i;
+   int seed=1;

    if(uname(&buf) == 0) {
    if(uname(&buf) == 0) {

-      for(i=0,seed=1; buf.nodename[i] != 0; i++) {
+      for(int i=0,seed=1; buf.nodename[i] != 0; ++i) {

          seed = seed * 31 + buf.nodename[i];
       }
    }
          seed = seed * 31 + buf.nodename[i];
       }
    }


@@ -266,7 +290,7 @@ bool MirrorMethod::InitMirrors()
    // FIXME: make the mirror selection more clever, do not 
    //        just use the first one!
    // BUT: we can not make this random, the mirror has to be
    // FIXME: make the mirror selection more clever, do not 
    //        just use the first one!
    // BUT: we can not make this random, the mirror has to be

-   //      stable accross session, because otherwise we can
+   //      stable across session, because otherwise we can

    //      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());


@@ -274,8 +298,21 @@ bool MirrorMethod::InitMirrors()
    while (!in.eof()) 
    {
       getline(in, s);
    while (!in.eof()) 
    {
       getline(in, s);

-      if (s.size() > 0)
-        AllMirrors.push_back(s);
+
+      // ignore lines that start with #
+      if (s.find("#") == 0)
+         continue;
+      // ignore empty lines
+      if (s.size() == 0)
+         continue;
+      // ignore non http lines
+      if (s.compare(0, strlen("http://"), "http://") != 0)
+         continue;
+
+      AllMirrors.push_back(s);
+   }
+   if (AllMirrors.empty()) {
+       return _error->Error(_("No entry found in mirror file '%s'"), MirrorFile.c_str());

    }
    Mirror = AllMirrors[0];
    UsedMirror = Mirror;
    }
    Mirror = AllMirrors[0];
    UsedMirror = Mirror;


@@ -316,7 +353,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)


@@ -329,6 +366,7 @@ string MirrorMethod::GetMirrorFileName(string mirror_uri_str)
         if(Debug)
            std::cerr << "found BaseURI: " << uristr << std::endl;
         BaseUri = uristr.substr(0,uristr.size()-1);
         if(Debug)
            std::cerr << "found BaseURI: " << uristr << std::endl;
         BaseUri = uristr.substr(0,uristr.size()-1);

+         Dist = (*I)->GetDist();

       }
    }
    // get new file
       }
    }
    // get new file


@@ -384,10 +422,10 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
 
    if(Debug)
       clog << "Fetch: " << Itm->Uri << endl << endl;
 
    if(Debug)
       clog << "Fetch: " << Itm->Uri << endl << endl;

-   
+

    // now run the real fetcher
    return HttpMethod::Fetch(Itm);
    // now run the real fetcher
    return HttpMethod::Fetch(Itm);

-};
+}

 
 void MirrorMethod::Fail(string Err,bool Transient)
 {
 
 void MirrorMethod::Fail(string Err,bool Transient)
 {


@@ -399,7 +437,7 @@ void MirrorMethod::Fail(string Err,bool Transient)
 
    // try the next mirror on fail (if its not a expected failure,
    // e.g. translations are ok to ignore)
 
    // try the next mirror on fail (if its not a expected failure,
    // e.g. translations are ok to ignore)

-   if (!Queue->FailIgnore && TryNextMirror()) 
+   if (!Queue->FailIgnore && TryNextMirror())

       return;
 
    // all mirrors failed, so bail out
       return;
 
    // all mirrors failed, so bail out