X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=213ad49bdf70b7183d8f361c506ddfaca8e9fbb8;hb=577a3c22efac8cad56e6f3fac29cc5bc55a4e21f;hp=4dba71f07fdae2501051d261d583ec2703895297;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 4dba71f0..213ad49b 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -2,8 +2,7 @@ # Create all the Release files -# Copyright (C) 2001, 2002 Anthony Towns -# $Id: ziyi,v 1.27 2005-11-15 09:50:32 ajt Exp $ +# Copyright (C) 2001, 2002, 2006 Anthony Towns # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,9 +22,9 @@ ################################################################################ -import sys, os, popen2, tempfile, stat, time -import utils +import sys, os, popen2, tempfile, stat, time, pg import apt_pkg +import daklib.utils ################################################################################ @@ -37,10 +36,12 @@ AptCnf = None ################################################################################ def usage (exit_code=0): - print """Usage: ziyi [OPTION]... [SUITE]... + print """Usage: dak generate-releases [OPTION]... [SUITE]... Generate Release files (for SUITE). -h, --help show this help and exit + -a, --apt-conf FILE use FILE instead of default apt.conf + -f, --force-touch ignore Untouchable directives in dak.conf If no SUITE is given Release files are generated for all suites.""" @@ -105,13 +106,13 @@ def print_md5sha_files (tree, files, hashop): (cat, path, name, ext)) else: size = os.stat(path + name)[stat.ST_SIZE] - file_handle = utils.open_file(path + name) - except utils.cant_open_exc: + file_handle = daklib.utils.open_file(path + name) + except daklib.utils.cant_open_exc: 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" % (hash, size, name)) def print_md5_files (tree, files): print_md5sha_files (tree, files, apt_pkg.md5sum) @@ -119,27 +120,38 @@ def print_md5_files (tree, files): def print_sha1_files (tree, files): print_md5sha_files (tree, files, apt_pkg.sha1sum) +def print_sha256_files (tree, files): + print_md5sha_files (tree, files, apt_pkg.sha256sum) + ################################################################################ def main (): global Cnf, AptCnf, projectB, out out = sys.stdout - Cnf = utils.get_conf() + Cnf = daklib.utils.get_conf() - Arguments = [('h',"help","Ziyi::Options::Help")] - for i in [ "help" ]: - if not Cnf.has_key("Ziyi::Options::%s" % (i)): - Cnf["Ziyi::Options::%s" % (i)] = "" + Arguments = [('h',"help","Generate-Releases::Options::Help"), + ('a',"apt-conf","Generate-Releases::Options::Apt-Conf", "HasArg"), + ('f',"force-touch","Generate-Releases::Options::Force-Touch"), + ] + for i in [ "help", "apt-conf", "force-touch" ]: + if not Cnf.has_key("Generate-Releases::Options::%s" % (i)): + Cnf["Generate-Releases::Options::%s" % (i)] = "" suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Ziyi::Options") + Options = Cnf.SubTree("Generate-Releases::Options") if Options["Help"]: usage() + if not Options["Apt-Conf"]: + Options["Apt-Conf"] = daklib.utils.which_apt_conf_file() + AptCnf = apt_pkg.newConfiguration() - apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file()) + apt_pkg.ReadConfigFileISC(AptCnf, Options["Apt-Conf"]) + + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) if not suites: suites = Cnf.SubTree("Suite").List() @@ -148,7 +160,7 @@ def main (): print "Processing: " + suite SuiteBlock = Cnf.SubTree("Suite::" + suite) - if SuiteBlock.has_key("Untouchable"): + if SuiteBlock.has_key("Untouchable") and not Options["Force-Touch"]: print "Skipping: " + suite + " (untouchable)" continue @@ -156,9 +168,17 @@ def main (): origin = SuiteBlock["Origin"] label = SuiteBlock.get("Label", origin) - version = SuiteBlock.get("Version", "") codename = SuiteBlock.get("CodeName", "") + version = "" + description = "" + + q = projectB.query("SELECT version, description FROM suite WHERE suite_name = '%s'" % (suite)) + qs = q.getresult() + if len(qs) == 1: + if qs[0][0] != "-": version = qs[0][0] + if qs[0][1]: description = qs[0][1] + if SuiteBlock.has_key("NotAutomatic"): notautomatic = "yes" else: @@ -182,7 +202,7 @@ def main (): elif AptCnf.has_key("bindirectory::%s" % (tree)): pass else: - aptcnf_filename = os.path.basename(utils.which_apt_conf_file()) + aptcnf_filename = os.path.basename(daklib.utils.which_apt_conf_file()) print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename) continue @@ -199,11 +219,12 @@ def main (): out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time())))) 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(daklib.utils.real_arch, SuiteBlock.ValueList("Architectures"))))) if components: out.write("Components: %s\n" % (" ".join(components))) - out.write("Description: %s\n" % (SuiteBlock["Description"])) + if description: + out.write("Description: %s\n" % (description)) files = [] @@ -235,10 +256,13 @@ def main (): 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) + daklib.utils.fubar("Couldn't write to " + relpath) release.write("Archive: %s\n" % (suite)) if version != "": @@ -256,14 +280,18 @@ def main (): files.append(rel) if AptCnf.has_key("tree::%s/main" % (tree)): - sec = AptCnf["tree::%s/main::Sections" % (tree)].split()[0] - if sec != "debian-installer": - print "ALERT: weird non debian-installer section in %s" % (tree) - - for arch in AptCnf["tree::%s/main::Architectures" % (tree)].split(): - if arch != "source": # always true - for file in compressnames("tree::%s/main" % (tree), "Packages", "main/%s/binary-%s/Packages" % (sec, arch)): - files.append(file) + for dis in ["main", "contrib", "non-free"]: + if not AptCnf.has_key("tree::%s/%s" % (tree, dis)): continue + sec = AptCnf["tree::%s/%s::Sections" % (tree,dis)].split()[0] + if sec != "debian-installer": + print "ALERT: weird non debian-installer section in %s" % (tree) + + 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), + "Packages", + "%s/%s/binary-%s/Packages" % (dis, sec, arch)): + files.append(file) elif AptCnf.has_key("tree::%s::FakeDI" % (tree)): usetree = AptCnf["tree::%s::FakeDI" % (tree)] sec = AptCnf["tree::%s/main::Sections" % (usetree)].split()[0] @@ -287,6 +315,8 @@ def main (): print_md5_files(tree, files) out.write("SHA1:\n") print_sha1_files(tree, files) + out.write("SHA256:\n") + print_sha256_files(tree, files) out.close() if Cnf.has_key("Dinstall::SigningKeyring"):