* doc/apt.conf.5.xml:

[apt.git] / methods / mirror.cc

diff --git a/methods/mirror.cc b/methods/mirror.cc
index ed42cdbfb75087c9011345aa2b5792f4562cb0e5..713dc211a1c8ecd103502ad4f419645749126c1c 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -16,12 +16,15 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/sourcelist.h>
 
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/sourcelist.h>
 

-#include <fstream>
+

 #include <algorithm>
 #include <algorithm>

+#include <fstream>

 #include <iostream>
 #include <iostream>

+

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

+#include <sys/utsname.h>

 #include <dirent.h>
 
 using namespace std;
 #include <dirent.h>
 
 using namespace std;


@@ -131,6 +134,10 @@ 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://");
 

+   // 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;


@@ -138,8 +145,10 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    pkgAcquire Fetcher;
    new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile);
    bool res = (Fetcher.Run() == pkgAcquire::Continue);
    pkgAcquire Fetcher;
    new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile);
    bool res = (Fetcher.Run() == pkgAcquire::Continue);

-   if(res)
+   if(res) {

       DownloadedMirrorFile = true;
       DownloadedMirrorFile = true;

+      chmod(MirrorFile.c_str(), 0644);
+   }

    Fetcher.Shutdown();
 
    if(Debug)
    Fetcher.Shutdown();
 
    if(Debug)


@@ -155,6 +164,9 @@ bool MirrorMethod::RandomizeMirrorFile(string mirror_file)
    vector<string> content;
    string line;
 
    vector<string> content;
    string line;
 

+   if (!FileExists(mirror_file))
+      return false;
+

    // read 
    ifstream in(mirror_file.c_str());
    while ( !in.eof() ) {
    // read 
    ifstream in(mirror_file.c_str());
    while ( !in.eof() ) {


@@ -162,7 +174,17 @@ bool MirrorMethod::RandomizeMirrorFile(string mirror_file)
       content.push_back(line);
    }
    
       content.push_back(line);
    }
    

-   // randomize
+   // 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;
+   if(uname(&buf) == 0) {
+      for(i=0,seed=1; buf.nodename[i] != 0; i++) {
+         seed = seed * 31 + buf.nodename[i];
+      }
+   }
+   srand( seed );

    random_shuffle(content.begin(), content.end());
 
    // write
    random_shuffle(content.begin(), content.end());
 
    // write


@@ -238,6 +260,13 @@ bool MirrorMethod::InitMirrors()
       return _error->Error(_("No mirror file '%s' found "), MirrorFile.c_str());
    }
 
       return _error->Error(_("No mirror file '%s' found "), MirrorFile.c_str());
    }
 

+   if (access(MirrorFile.c_str(), R_OK) != 0)
+   {
+      // FIXME: fallback to a default mirror here instead 
+      //        and provide a config option to define that default
+      return _error->Error(_("Can not read mirror file '%s'"), MirrorFile.c_str());
+   }  
+

    // 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


@@ -249,8 +278,18 @@ 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.find("http://") != 0)
+         continue;
+
+      AllMirrors.push_back(s);

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


@@ -304,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);
         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


@@ -341,8 +381,8 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
    if(Itm->IndexFile && !DownloadedMirrorFile)
    {
       Clean(_config->FindDir("Dir::State::mirrors"));
    if(Itm->IndexFile && !DownloadedMirrorFile)
    {
       Clean(_config->FindDir("Dir::State::mirrors"));

-      DownloadMirrorFile(Itm->Uri);
-      RandomizeMirrorFile(MirrorFile);
+      if (DownloadMirrorFile(Itm->Uri))
+         RandomizeMirrorFile(MirrorFile);

    }
 
    if(AllMirrors.empty()) {
    }
 
    if(AllMirrors.empty()) {


@@ -403,8 +443,6 @@ int main()
 {
    setlocale(LC_ALL, "");
 
 {
    setlocale(LC_ALL, "");
 

-   srand ( time(NULL) );
-

    MirrorMethod Mth;
 
    return Mth.Loop();
    MirrorMethod Mth;
 
    return Mth.Loop();