do not crash if the mirror file fails to download

diff --git a/debian/changelog b/debian/changelog
index 6ccb3dede32317574d3bee8ab334461c1b459a1b..fc883dc0d40088069c2ef7093fe5d322f427ef5e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ apt (0.8.13) unstable; urgency=low
     - when downloading data, show the mirror being used
     - randomize mirror list to ensure more even load
     - merge fix from Matt Zimmerman, many thanks (LP: #741098)
     - when downloading data, show the mirror being used
     - randomize mirror list to ensure more even load
     - merge fix from Matt Zimmerman, many thanks (LP: #741098)

+    - do not crash if the mirror file fails to download

 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
 

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 9d8202dad58340dfa1734bbe2850e53dbfc44ac4..00757e61f0a7a8ba65c13485042d444fc2c9c743 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -160,6 +160,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() ) {


@@ -356,8 +359,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()) {