generate_releases

[dak.git] / dak / generate_releases.py

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 7306dceccc1d30b0cfca32136983720e65048cfd..8d0a3d876477ce4a528c36c6b3b7923b9355c359 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -23,7 +23,7 @@
 ################################################################################
 
 import sys, os, stat, time, pg
-import zlib, bz2
+import gzip, bz2
 import apt_pkg
 from daklib import utils
 from daklib.dak_exceptions import *
@@ -78,38 +78,28 @@ def compressnames (tree,type,file):
             result.append(file + ".bz2")
     return result
 
-compressors = { 'zcat' : zlib.compress,
-                'bzip2' : bz2.compress }
-
-def compress(how, filename):
-    compressor = compressors[ how ]
-    uncompressed = None
-    output = None
-    try:
-        uncompressed = utils.open_file(filename)
-        output = compressor(uncompressed.read())
-    except:
-        raise
-    else:
-        if uncompressed:
-            uncompressed.close()
-
-    return output
+decompressors = { 'zcat' : gzip.GzipFile,
+                  'bzip2' : bz2.BZ2File }
 
 def print_md5sha_files (tree, files, hashop):
     path = Cnf["Dir::Root"] + tree + "/"
     for name in files:
+        hashvalue = ""
+        hashlen = 0
         try:
             if name[0] == "<":
                 j = name.index("/")
                 k = name.index(">")
                 (cat, ext, name) = (name[1:j], name[j+1:k], name[k+1:])
-                contents = compress( cat, "%s%s%s" % (path, name, ext) )
+                file_handle = decompressors[ cat ]( "%s%s%s" % (path, name, ext) )
+                contents = file_handle.read()
+                hashvalue = hashop(contents)
+                hashlen = len(contents)
             else:
-                size = os.stat(path + name)[stat.ST_SIZE]
                 try:
                     file_handle = utils.open_file(path + name)
-                    contents = file_handle.read()
+                    hashvalue = hashop(file_handle)
+                    hashlen = os.stat(path + name).st_size
                 except:
                     raise
                 else:
@@ -119,8 +109,7 @@ def print_md5sha_files (tree, files, hashop):
         except CantOpenError:
             print "ALERT: Couldn't open " + path + name
         else:
-            hash = hashop(contents)
-            out.write(" %s %8d %s\n" % (hash, len(contents), name))
+            out.write(" %s %8d %s\n" % (hashvalue, hashlen, name))
 
 def print_md5_files (tree, files):
     print_md5sha_files (tree, files, apt_pkg.md5sum)