[Debpool-commits] [SCM] Debpool Project Repository branch, master, updated. debian/0.3.6-4-g12dd924

[Andres Mejia]

The following commit has been merged in the master branch:
commit 12dd924673d9e51767245563fff51349d29d65c5
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Thu Oct 16 17:13:58 2008 -0400

    Fix problem in compression modules which would cause us to compress empty files incorrectly.

diff --git a/lib/DebPool/Bzip2.pm b/lib/DebPool/Bzip2.pm
index f14aa14..4b47803 100644
--- a/lib/DebPool/Bzip2.pm
+++ b/lib/DebPool/Bzip2.pm
@@ -122,13 +122,13 @@ sub Bzip2_File {
             close SOURCE;
             return undef;
         }
-        last if $bytesread == 0;
         my $byteswritten = $bz->bzwrite($buffer);
         if ($byteswritten < $bytesread) {
             $Error = "Error bzwriting to temporary file: " . $bz->bzerror;
             close SOURCE;
             return undef;
         }
+        last if $bytesread == 0;
     }
 
     my $bzflush = $bz->bzflush(BZ_FINISH);
diff --git a/lib/DebPool/Gzip.pm b/lib/DebPool/Gzip.pm
index f596d87..aee1a6f 100644
--- a/lib/DebPool/Gzip.pm
+++ b/lib/DebPool/Gzip.pm
@@ -122,13 +122,13 @@ sub Gzip_File {
             close SOURCE;
             return undef;
         }
-        last if $bytesread == 0;
         my $byteswritten = $gz->gzwrite($buffer);
         if ($byteswritten < $bytesread) {
             $Error = "Error gzwriting to temporary file: " . $gz->gzerror;
             close SOURCE;
             return undef;
         }
+        last if $bytesread == 0;
     }
 
     my $gzflush = $gz->gzflush(Z_FINISH);

-- 
Debpool Project Repository