summaryrefslogtreecommitdiff
path: root/methods/mirror.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2011-03-11 13:57:52 +0100
committerMichael Vogt <mvo@debian.org>2011-03-11 13:57:52 +0100
commitd19b539614c9ab44477e8716a5dd9983dd5a53b2 (patch)
treec6a7d9480118f802c02225589dab44bcef4de086 /methods/mirror.cc
parenta75b8cfeb6d7e2468b19534d5b5872c3885f0e1c (diff)
parentd6cc7079e895e76ad9d086fcc6a40224dd41bb62 (diff)
merged from lp:~mvo/apt/mvo
Diffstat (limited to 'methods/mirror.cc')
-rw-r--r--methods/mirror.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/methods/mirror.cc b/methods/mirror.cc
index e8873d97b..d092cc657 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -125,20 +125,25 @@ bool MirrorMethod::Clean(string Dir)
bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
{
- if(Debug)
- clog << "MirrorMethod::DownloadMirrorFile(): " << endl;
-
// 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://");
+ if(Debug)
+ clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"
+ << " to " << MirrorFile << endl;
+
pkgAcquire Fetcher;
new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile);
bool res = (Fetcher.Run() == pkgAcquire::Continue);
if(res)
DownloadedMirrorFile = true;
Fetcher.Shutdown();
+
+ if(Debug)
+ clog << "MirrorMethod::DownloadMirrorFile() success: " << res << endl;
+
return res;
}
@@ -176,7 +181,7 @@ bool MirrorMethod::TryNextMirror()
continue;
vector<string>::const_iterator nextmirror = mirror + 1;
- if (nextmirror != AllMirrors.end())
+ if (nextmirror == AllMirrors.end())
break;
Queue->Uri.replace(0, mirror->length(), *nextmirror);
if (Debug)