merge fix from Matt Zimmerman, many thanks (LP: #741098)

diff --git a/debian/changelog b/debian/changelog
index d9a20765ff45b17ed08a0c2eee53e1a9dc1d5064..6ccb3dede32317574d3bee8ab334461c1b459a1b 100644 (file)
--- 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
   * 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
 
 
  -- 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 e499b054b15edb0e36a62bf08417a6867e6aeba4..9d8202dad58340dfa1734bbe2850e53dbfc44ac4 100644 (file)
--- 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);
    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)