X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=d6aeb390b1c3f1d0d100a4c422d386288e99317f;hb=425e44739cd77ffa01294f23e94ae7eabd5f5ec8;hp=8d0a3d876477ce4a528c36c6b3b7923b9355c359;hpb=f6fa12e0e3fe4d6aa9157085b77ed25e73745fe5;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 8d0a3d87..d6aeb390 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Create all the Release files +""" Create all the Release files """ # Copyright (C) 2001, 2002, 2006 Anthony Towns @@ -26,6 +26,7 @@ import sys, os, stat, time, pg import gzip, bz2 import apt_pkg from daklib import utils +from daklib import database from daklib.dak_exceptions import * ################################################################################ @@ -120,6 +121,31 @@ def print_sha1_files (tree, files): def print_sha256_files (tree, files): print_md5sha_files (tree, files, apt_pkg.sha256sum) +def write_release_file (relpath, suite, component, origin, label, arch, version="", suite_suffix="", notautomatic=""): + try: + if os.access(relpath, os.F_OK): + if os.stat(relpath).st_nlink > 1: + os.unlink(relpath) + release = open(relpath, "w") + except IOError: + utils.fubar("Couldn't write to " + relpath) + + release.write("Archive: %s\n" % (suite)) + if version != "": + release.write("Version: %s\n" % (version)) + + if suite_suffix: + release.write("Component: %s/%s\n" % (suite_suffix,component)) + else: + release.write("Component: %s\n" % (component)) + + release.write("Origin: %s\n" % (origin)) + release.write("Label: %s\n" % (label)) + if notautomatic != "": + release.write("NotAutomatic: %s\n" % (notautomatic)) + release.write("Architecture: %s\n" % (arch)) + release.close() + ################################################################################ def main (): @@ -149,6 +175,7 @@ def main (): apt_pkg.ReadConfigFileISC(AptCnf, Options["Apt-Conf"]) projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) + database.init(Cnf, projectB) if not suites: suites = Cnf.SubTree("Suite").List() @@ -157,7 +184,7 @@ def main (): print "Processing: " + suite SuiteBlock = Cnf.SubTree("Suite::" + suite) - if SuiteBlock.has_key("Untouchable") and not Options["Force-Touch"]: + if database.get_suite_untouchable(suite) and not Options["Force-Touch"]: print "Skipping: " + suite + " (untouchable)" continue @@ -176,6 +203,10 @@ def main (): if qs[0][0] != "-": version = qs[0][0] if qs[0][1]: description = qs[0][1] + architectures = database.get_suite_architectures(suite) + if architectures == None: + architectures = [] + if SuiteBlock.has_key("NotAutomatic"): notautomatic = "yes" else: @@ -221,7 +252,7 @@ def main (): if notautomatic != "": out.write("NotAutomatic: %s\n" % (notautomatic)) - out.write("Architectures: %s\n" % (" ".join(filter(utils.real_arch, SuiteBlock.ValueList("Architectures"))))) + out.write("Architectures: %s\n" % (" ".join(filter(utils.real_arch, architectures)))) if components: out.write("Components: %s\n" % (" ".join(components))) @@ -231,12 +262,19 @@ def main (): files = [] if AptCnf.has_key("tree::%s" % (tree)): + if AptCnf.has_key("tree::%s::Contents" % (tree)): + pass + else: + for x in os.listdir("%s/%s" % (Cnf["Dir::Root"], tree)): + if x.startswith('Contents-'): + files.append(x) + for sec in AptCnf["tree::%s::Sections" % (tree)].split(): 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) @@ -247,8 +285,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": @@ -256,29 +294,7 @@ def main (): else: rel = "%s/binary-%s/Release" % (sec, arch) relpath = Cnf["Dir::Root"]+tree+"/"+rel - - try: - if os.access(relpath, os.F_OK): - if os.stat(relpath).st_nlink > 1: - os.unlink(relpath) - release = open(relpath, "w") - #release = open(longsuite.replace("/","_") + "_" + arch + "_" + sec + "_Release", "w") - except IOError: - utils.fubar("Couldn't write to " + relpath) - - release.write("Archive: %s\n" % (suite)) - if version != "": - release.write("Version: %s\n" % (version)) - if suite_suffix: - release.write("Component: %s/%s\n" % (suite_suffix,sec)) - else: - release.write("Component: %s\n" % (sec)) - release.write("Origin: %s\n" % (origin)) - release.write("Label: %s\n" % (label)) - if notautomatic != "": - release.write("NotAutomatic: %s\n" % (notautomatic)) - release.write("Architecture: %s\n" % (arch)) - release.close() + write_release_file(relpath, suite, sec, origin, label, arch, version, suite_suffix, notautomatic) files.append(rel) if AptCnf.has_key("tree::%s/main" % (tree)): @@ -290,10 +306,14 @@ 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), + rel = "%s/%s/binary-%s/Release" % (dis, sec, arch) + relpath = Cnf["Dir::Root"]+tree+"/"+rel + write_release_file(relpath, suite, dis, origin, label, arch, version, suite_suffix, notautomatic) + files.append(rel) + 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] @@ -302,14 +322,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)