summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-03-24 17:37:18 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-03-24 17:37:18 +0100
commit83e6798e72fabee7ec333a7e897b095cda688c45 (patch)
treeed0dfabfb208863f7be246c1751c98b9a51a6c87
parentca0a660c3b63717ffec0305bba95af6930e62c34 (diff)
merge fix from Matt Zimmerman, many thanks (LP: #741098)
-rw-r--r--debian/changelog1
-rw-r--r--methods/mirror.cc4
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d9a20765f..6ccb3dede 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ apt (0.8.13) unstable; urgency=low
* mirror method:
- 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)
-- 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 e499b054b..9d8202dad 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -141,8 +141,10 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
pkgAcquire Fetcher;
new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile);
bool res = (Fetcher.Run() == pkgAcquire::Continue);
- if(res)
+ if(res) {
DownloadedMirrorFile = true;
+ chmod(MirrorFile.c_str(), 0644);
+ }
Fetcher.Shutdown();
if(Debug)