* methods/{gzip,bzip2}.cc:

  - empty files can never be valid archives (Closes: #595691)

diff --git a/debian/changelog b/debian/changelog
index 4dca62603eba38ae79bf8228bc2803d464422aa0..07196db25d34d9e3aeed548adff32c570965ae5e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ apt (0.8.2) UNRELEASED; urgency=low
   * cmdline/apt-key:
     - support also Dir::Etc::Trusted so that apt-key works in the same
       way as the library part which works with the trusted files
+  * methods/{gzip,bzip2}.cc:
+    - empty files can never be valid archives (Closes: #595691)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 04 Sep 2010 15:25:10 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 06 Sep 2010 12:16:58 +0200
 
 apt (0.8.1) unstable; urgency=low
 

diff --git a/methods/bzip2.cc b/methods/bzip2.cc
index 241f21c66bd3a30588ef85c7e5bc9da223280a2b..c668141a2919622c7809b76fac64de55261ad8e4 100644 (file)
--- a/methods/bzip2.cc
+++ b/methods/bzip2.cc
@@ -56,12 +56,9 @@ bool Bzip2Method::Fetch(FetchItem *Itm)
    // Open the source and destination files
    FileFd From(Path,FileFd::ReadOnly);
 
-   // if the file is empty, just rename it and return
-   if(From.Size() == 0) 
-   {
-      rename(Path.c_str(), Itm->DestFile.c_str());
-      return true;
-   }
+   // FIXME add an error message saying that empty files can't be valid archives
+   if(From.Size() == 0)
+      return false;
 
    int GzOut[2];   
    if (pipe(GzOut) < 0)

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 5b9b66b50375769f1d528b11c00d116c03e0841d..22cae94244b62e067717d9a2cdf77b832ed07ef7 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -48,12 +48,9 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    // Open the source and destination files
    FileFd From(Path,FileFd::ReadOnlyGzip);
 
-   // if the file is empty, just rename it and return
-   if(From.Size() == 0) 
-   {
-      rename(Path.c_str(), Itm->DestFile.c_str());
-      return true;
-   }
+   // FIXME add an error message saying that empty files can't be valid archives
+   if(From.Size() == 0)
+      return false;
 
    FileFd To(Itm->DestFile,FileFd::WriteAtomic);   
    To.EraseOnFailure();