From: Joerg Jaspert Date: Wed, 21 Jan 2009 22:22:06 +0000 (+0100) Subject: Merge commit 'stew/popen2-must-die' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=800ce9330b0e32661f1dec044e24704bf3a8dc66;hp=aa0907e8e139c58917b4343df6b0901289bfe027;p=dak.git Merge commit 'stew/popen2-must-die' into merge * commit 'stew/popen2-must-die': oops DEcompress, dummy getting rid of popen2 in generate_releases Signed-off-by: Joerg Jaspert --- diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 00831192..64d1d20c 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -22,7 +22,8 @@ ################################################################################ -import sys, os, popen2, tempfile, stat, time, pg +import sys, os, stat, time, pg +import gzip, bz2 import apt_pkg from daklib import utils from daklib.dak_exceptions import * @@ -77,23 +78,8 @@ def compressnames (tree,type,file): result.append(file + ".bz2") return result -def create_temp_file (cmd): - f = tempfile.TemporaryFile() - r = popen2.popen2(cmd) - r[1].close() - r = r[0] - size = 0 - while 1: - x = r.readline() - if not x: - r.close() - del x,r - break - f.write(x) - size += len(x) - f.flush() - f.seek(0) - return (size, f) +decompressors = { 'zcat' : gzip.GzipFile, + 'bzip2' : bz2.BZ2File } def print_md5sha_files (tree, files, hashop): path = Cnf["Dir::Root"] + tree + "/" @@ -103,17 +89,23 @@ def print_md5sha_files (tree, files, hashop): j = name.index("/") k = name.index(">") (cat, ext, name) = (name[1:j], name[j+1:k], name[k+1:]) - (size, file_handle) = create_temp_file("%s %s%s%s" % - (cat, path, name, ext)) + file_handle = decompressors[ cat ]( "%s%s%s" % (path, name, ext) ) + contents = file_handle.read() else: - size = os.stat(path + name)[stat.ST_SIZE] - file_handle = utils.open_file(path + name) + try: + file_handle = utils.open_file(path + name) + contents = file_handle.read() + except: + raise + else: + if file_handle: + file_handle.close() + except CantOpenError: print "ALERT: Couldn't open " + path + name else: - hash = hashop(file_handle) - file_handle.close() - out.write(" %s %8d %s\n" % (hash, size, name)) + hash = hashop(contents) + out.write(" %s %8d %s\n" % (hash, len(contents), name)) def print_md5_files (tree, files): print_md5sha_files (tree, files, apt_pkg.md5sum)