Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

[apt.git] / apt-private / private-download.cc

diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index 4894c72bfe8f3767879f537145488bf2bd69c5ef..40312d0c8c76f10da3198163ff1973cf29642b9c 100644 (file)
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <sys/statvfs.h>
+#include <sys/stat.h>
 #include <errno.h>
 
 #include <apti18n.h>
@@ -224,6 +225,7 @@ bool DoDownload(CommandLine &CmdL)
         std::ifstream src((*I)->DestFile.c_str(), std::ios::binary);
         std::ofstream dst(filename.c_str(), std::ios::binary);
         dst << src.rdbuf();
+        chmod(filename.c_str(), 0644);
       }
    }
    return Failed == false;
@@ -331,7 +333,7 @@ bool DoClean(CommandLine &)
         c1out << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "B]" << std::endl;
 
         if (_config->FindB("APT::Get::Simulate") == false)
-           unlink(File);
+           RemoveFile("Cleaner::Erase", File);
       };
 };
 bool DoAutoClean(CommandLine &)