From: James Troup Date: Fri, 28 Dec 2007 21:52:13 +0000 (+0000) Subject: [AJ] add -a/--apt-conf and -f/--force-touch options. Pull version info from the... X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=936d832dc867e2e80f7bf4a8f26344b94790d640;p=dak.git [AJ] add -a/--apt-conf and -f/--force-touch options. Pull version info from the database. Make description optional --- diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 0ae4aecf..213ad49b 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -22,7 +22,7 @@ ################################################################################ -import sys, os, popen2, tempfile, stat, time +import sys, os, popen2, tempfile, stat, time, pg import apt_pkg import daklib.utils @@ -40,6 +40,8 @@ def usage (exit_code=0): 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.""" @@ -129,8 +131,11 @@ def main (): Cnf = daklib.utils.get_conf() - Arguments = [('h',"help","Generate-Releases::Options::Help")] - for i in [ "help" ]: + 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)] = "" @@ -140,10 +145,13 @@ def main (): 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,daklib.utils.which_apt_conf_file()) - #apt_pkg.ReadConfigFileISC(AptCnf,"/org/ftp.debian.org/dak/config/debian/apt.conf.stable") - #apt_pkg.ReadConfigFileISC(AptCnf,"/org/ftp.debian.org/dak/config/debian/apt.conf.oldstable") + 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() @@ -152,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 @@ -160,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: @@ -207,7 +223,8 @@ def main (): 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 = []