X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=a1552451051f2a189b9ab57cd8093da8ca2673fb;hb=af486e867c2809515c09ae4f854a95355112010e;hp=867fbc848523e9a8f3da317c45d50f3844c7b217;hpb=d9822f04453a1b62ca0aa66e2efeea35f654778f;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py old mode 100644 new mode 100755 index 867fbc84..a1552451 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -22,9 +22,11 @@ ################################################################################ -import sys, os, popen2, tempfile, stat, time, pg +import sys, os, stat, time, pg +import gzip, bz2 import apt_pkg -import daklib.utils +from daklib import utils +from daklib.dak_exceptions import * ################################################################################ @@ -76,43 +78,38 @@ 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 + "/" 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:]) - (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() + hashvalue = hashop(contents) + hashlen = len(contents) else: - size = os.stat(path + name)[stat.ST_SIZE] - file_handle = daklib.utils.open_file(path + name) - except daklib.utils.cant_open_exc: + try: + file_handle = utils.open_file(path + name) + hashvalue = hashop(file_handle) + hashlen = os.stat(path + name).st_size + 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)) + out.write(" %s %8d %s\n" % (hashvalue, hashlen, name)) def print_md5_files (tree, files): print_md5sha_files (tree, files, apt_pkg.md5sum) @@ -129,7 +126,7 @@ def main (): global Cnf, AptCnf, projectB, out out = sys.stdout - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('h',"help","Generate-Releases::Options::Help"), ('a',"apt-conf","Generate-Releases::Options::Apt-Conf", "HasArg"), @@ -146,7 +143,7 @@ def main (): usage() if not Options["Apt-Conf"]: - Options["Apt-Conf"] = daklib.utils.which_apt_conf_file() + Options["Apt-Conf"] = utils.which_apt_conf_file() AptCnf = apt_pkg.newConfiguration() apt_pkg.ReadConfigFileISC(AptCnf, Options["Apt-Conf"]) @@ -202,7 +199,7 @@ def main (): elif AptCnf.has_key("bindirectory::%s" % (tree)): pass else: - aptcnf_filename = os.path.basename(daklib.utils.which_apt_conf_file()) + aptcnf_filename = os.path.basename(utils.which_apt_conf_file()) print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename) continue @@ -217,9 +214,14 @@ def main (): if codename != "": out.write("Codename: %s\n" % (codename)) out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time())))) + + if SuiteBlock.has_key("ValidTime"): + validtime=float(SuiteBlock["ValidTime"]) + out.write("Valid-Until: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()+validtime)))) + if notautomatic != "": out.write("NotAutomatic: %s\n" % (notautomatic)) - out.write("Architectures: %s\n" % (" ".join(filter(daklib.utils.real_arch, SuiteBlock.ValueList("Architectures"))))) + out.write("Architectures: %s\n" % (" ".join(filter(utils.real_arch, SuiteBlock.ValueList("Architectures"))))) if components: out.write("Components: %s\n" % (" ".join(components))) @@ -233,8 +235,8 @@ def main (): for arch in AptCnf["tree::%s::Architectures" % (tree)].split(): if arch == "source": filepath = "%s/%s/Sources" % (sec, arch) - for file in compressnames("tree::%s" % (tree), "Sources", filepath): - files.append(file) + for cfile in compressnames("tree::%s" % (tree), "Sources", filepath): + files.append(cfile) add_tiffani(files, Cnf["Dir::Root"] + tree, filepath) else: disks = "%s/disks-%s" % (sec, arch) @@ -245,8 +247,8 @@ def main (): files.append("%s/%s/md5sum.txt" % (disks, dir)) filepath = "%s/binary-%s/Packages" % (sec, arch) - for file in compressnames("tree::%s" % (tree), "Packages", filepath): - files.append(file) + for cfile in compressnames("tree::%s" % (tree), "Packages", filepath): + files.append(cfile) add_tiffani(files, Cnf["Dir::Root"] + tree, filepath) if arch == "source": @@ -262,7 +264,7 @@ def main (): release = open(relpath, "w") #release = open(longsuite.replace("/","_") + "_" + arch + "_" + sec + "_Release", "w") except IOError: - daklib.utils.fubar("Couldn't write to " + relpath) + utils.fubar("Couldn't write to " + relpath) release.write("Archive: %s\n" % (suite)) if version != "": @@ -288,10 +290,10 @@ def main (): for arch in AptCnf["tree::%s/%s::Architectures" % (tree,dis)].split(): if arch != "source": # always true - for file in compressnames("tree::%s/%s" % (tree,dis), + for cfile in compressnames("tree::%s/%s" % (tree,dis), "Packages", "%s/%s/binary-%s/Packages" % (dis, sec, arch)): - files.append(file) + files.append(cfile) elif AptCnf.has_key("tree::%s::FakeDI" % (tree)): usetree = AptCnf["tree::%s::FakeDI" % (tree)] sec = AptCnf["tree::%s/main::Sections" % (usetree)].split()[0] @@ -300,14 +302,14 @@ def main (): for arch in AptCnf["tree::%s/main::Architectures" % (usetree)].split(): if arch != "source": # always true - for file in compressnames("tree::%s/main" % (usetree), "Packages", "main/%s/binary-%s/Packages" % (sec, arch)): - files.append(file) + for cfile in compressnames("tree::%s/main" % (usetree), "Packages", "main/%s/binary-%s/Packages" % (sec, arch)): + files.append(cfile) elif AptCnf.has_key("bindirectory::%s" % (tree)): - for file in compressnames("bindirectory::%s" % (tree), "Packages", AptCnf["bindirectory::%s::Packages" % (tree)]): - files.append(file.replace(tree+"/","",1)) - for file in compressnames("bindirectory::%s" % (tree), "Sources", AptCnf["bindirectory::%s::Sources" % (tree)]): - files.append(file.replace(tree+"/","",1)) + for cfile in compressnames("bindirectory::%s" % (tree), "Packages", AptCnf["bindirectory::%s::Packages" % (tree)]): + files.append(cfile.replace(tree+"/","",1)) + for cfile in compressnames("bindirectory::%s" % (tree), "Sources", AptCnf["bindirectory::%s::Sources" % (tree)]): + files.append(cfile.replace(tree+"/","",1)) else: print "ALERT: no tree/bindirectory for %s" % (tree)