From 0004842de7eeac345b614fa0b6bd241af0c4cc34 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 24 Mar 2011 17:45:20 +0100
Subject: do not crash if the mirror file fails to download

---
 methods/mirror.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'methods/mirror.cc')

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 9d8202dad..00757e61f 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -160,6 +160,9 @@ bool MirrorMethod::RandomizeMirrorFile(string mirror_file)
    vector<string> content;
    string line;
 
+   if (!FileExists(mirror_file))
+      return false;
+
    // 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"));
-      DownloadMirrorFile(Itm->Uri);
-      RandomizeMirrorFile(MirrorFile);
+      if (DownloadMirrorFile(Itm->Uri))
+         RandomizeMirrorFile(MirrorFile);
    }
 
    if(AllMirrors.empty()) {
-- 
cgit v1.2.3