X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=4b704b97b9aaf133b18e5894013e2d2cb1ddb728;hb=f8996e240d9d0278bce098e23be63db0bcc6fbee;hp=fb3f5fcce3ef48dde9b5167cb0207ea8a0abebdd;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git diff --git a/dak/control_suite.py b/dak/control_suite.py old mode 100755 new mode 100644 index fb3f5fcc..4b704b97 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -1,8 +1,7 @@ #!/usr/bin/env python # Manipulate suite tags -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 James Troup -# $Id: heidi,v 1.19 2005-11-15 09:50:32 ajt Exp $ +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 James Troup # 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 @@ -44,7 +43,9 @@ import pg, sys import apt_pkg -import utils, db_access, logging +from daklib import database +from daklib import logging +from daklib import utils ####################################################################################### @@ -55,7 +56,7 @@ Logger = None ################################################################################ def usage (exit_code=0): - print """Usage: heidi [OPTIONS] [FILE] + print """Usage: dak control-suite [OPTIONS] [FILE] Display or alter the contents of a suite using FILE(s), or stdin. -a, --add=SUITE add to SUITE @@ -76,13 +77,12 @@ def get_id (package, version, architecture): ql = q.getresult() if not ql: - utils.warn("Couldn't find '%s~%s~%s'." % (package, version, architecture)) + utils.warn("Couldn't find '%s_%s_%s'." % (package, version, architecture)) return None if len(ql) > 1: - utils.warn("Found more than one match for '%s~%s~%s'." % (package, version, architecture)) + utils.warn("Found more than one match for '%s_%s_%s'." % (package, version, architecture)) return None - id = ql[0][0] - return id + return ql[0][0] ####################################################################################### @@ -118,25 +118,25 @@ def set_suite (file, suite_id): for key in current.keys(): if not desired.has_key(key): (package, version, architecture) = key.split() - id = current[key] + pkid = current[key] if architecture == "source": - q = projectB.query("DELETE FROM src_associations WHERE id = %s" % (id)) + q = projectB.query("DELETE FROM src_associations WHERE id = %s" % (pkid)) else: - q = projectB.query("DELETE FROM bin_associations WHERE id = %s" % (id)) - Logger.log(["removed",key,id]) + q = projectB.query("DELETE FROM bin_associations WHERE id = %s" % (pkid)) + Logger.log(["removed", key, pkid]) # Check to see which packages need added and add them for key in desired.keys(): if not current.has_key(key): (package, version, architecture) = key.split() - id = get_id (package, version, architecture) - if not id: + pkid = get_id (package, version, architecture) + if not pkid: continue if architecture == "source": - q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, id)) + q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, pkid)) else: - q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, id)) - Logger.log(["added",key,id]) + q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, pkid)) + Logger.log(["added", key, pkid]) projectB.query("COMMIT WORK") @@ -144,7 +144,7 @@ def set_suite (file, suite_id): def process_file (file, suite, action): - suite_id = db_access.get_suite_id(suite) + suite_id = database.get_suite_id(suite) if action == "set": set_suite (file, suite_id) @@ -162,13 +162,13 @@ def process_file (file, suite, action): (package, version, architecture) = split_line - id = get_id(package, version, architecture) - if not id: + pkid = get_id(package, version, architecture) + if not pkid: continue if architecture == "source": # Find the existing assoications ID, if any - q = projectB.query("SELECT id FROM src_associations WHERE suite = %s and source = %s" % (suite_id, id)) + q = projectB.query("SELECT id FROM src_associations WHERE suite = %s and source = %s" % (suite_id, pkid)) ql = q.getresult() if not ql: assoication_id = None @@ -177,19 +177,19 @@ def process_file (file, suite, action): # Take action if action == "add": if assoication_id: - utils.warn("'%s~%s~%s' already exists in suite %s." % (package, version, architecture, suite)) + utils.warn("'%s_%s_%s' already exists in suite %s." % (package, version, architecture, suite)) continue else: - q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, id)) + q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, pkid)) elif action == "remove": if assoication_id == None: - utils.warn("'%s~%s~%s' doesn't exist in suite %s." % (package, version, architecture, suite)) + utils.warn("'%s_%s_%s' doesn't exist in suite %s." % (package, version, architecture, suite)) continue else: q = projectB.query("DELETE FROM src_associations WHERE id = %s" % (assoication_id)) else: # Find the existing assoications ID, if any - q = projectB.query("SELECT id FROM bin_associations WHERE suite = %s and bin = %s" % (suite_id, id)) + q = projectB.query("SELECT id FROM bin_associations WHERE suite = %s and bin = %s" % (suite_id, pkid)) ql = q.getresult() if not ql: assoication_id = None @@ -198,13 +198,13 @@ def process_file (file, suite, action): # Take action if action == "add": if assoication_id: - utils.warn("'%s~%s~%s' already exists in suite %s." % (package, version, architecture, suite)) + utils.warn("'%s_%s_%s' already exists in suite %s." % (package, version, architecture, suite)) continue else: - q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, id)) + q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, pkid)) elif action == "remove": if assoication_id == None: - utils.warn("'%s~%s~%s' doesn't exist in suite %s." % (package, version, architecture, suite)) + utils.warn("'%s_%s_%s' doesn't exist in suite %s." % (package, version, architecture, suite)) continue else: q = projectB.query("DELETE FROM bin_associations WHERE id = %s" % (assoication_id)) @@ -214,7 +214,7 @@ def process_file (file, suite, action): ####################################################################################### def get_list (suite): - suite_id = db_access.get_suite_id(suite) + suite_id = database.get_suite_id(suite) # List binaries q = projectB.query("SELECT b.package, b.version, a.arch_string FROM binaries b, bin_associations ba, architecture a WHERE ba.suite = %s AND ba.bin = b.id AND b.architecture = a.id" % (suite_id)) ql = q.getresult() @@ -234,32 +234,36 @@ def main (): Cnf = utils.get_conf() - Arguments = [('a',"add","Heidi::Options::Add", "HasArg"), - ('h',"help","Heidi::Options::Help"), - ('l',"list","Heidi::Options::List","HasArg"), - ('r',"remove", "Heidi::Options::Remove", "HasArg"), - ('s',"set", "Heidi::Options::Set", "HasArg")] + Arguments = [('a',"add","Control-Suite::Options::Add", "HasArg"), + ('h',"help","Control-Suite::Options::Help"), + ('l',"list","Control-Suite::Options::List","HasArg"), + ('r',"remove", "Control-Suite::Options::Remove", "HasArg"), + ('s',"set", "Control-Suite::Options::Set", "HasArg")] for i in ["add", "help", "list", "remove", "set", "version" ]: - if not Cnf.has_key("Heidi::Options::%s" % (i)): - Cnf["Heidi::Options::%s" % (i)] = "" + if not Cnf.has_key("Control-Suite::Options::%s" % (i)): + Cnf["Control-Suite::Options::%s" % (i)] = "" - file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Heidi::Options") + try: + file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); + except SystemError, e: + print "%s\n" % e + usage(1) + Options = Cnf.SubTree("Control-Suite::Options") if Options["Help"]: - usage() + usage() projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"],int(Cnf["DB::Port"])) - db_access.init(Cnf, projectB) + database.init(Cnf, projectB) action = None for i in ("add", "list", "remove", "set"): - if Cnf["Heidi::Options::%s" % (i)] != "": - suite = Cnf["Heidi::Options::%s" % (i)] - if db_access.get_suite_id(suite) == -1: + if Cnf["Control-Suite::Options::%s" % (i)] != "": + suite = Cnf["Control-Suite::Options::%s" % (i)] + if database.get_suite_id(suite) == -1: utils.fubar("Unknown suite '%s'." %(suite)) else: if action: @@ -271,16 +275,16 @@ def main (): utils.fubar("No action specified.") # Safety/Sanity check - if action == "set" and suite != "testing": + if action == "set" and suite not in ["testing", "etch-m68k"]: utils.fubar("Will not reset a suite other than testing.") if action == "list": get_list(suite) else: - Logger = logging.Logger(Cnf, "heidi") + Logger = logging.Logger(Cnf, "control-suite") if file_list: - for file in file_list: - process_file(utils.open_file(file), suite, action) + for f in file_list: + process_file(utils.open_file(f), suite, action) else: process_file(sys.stdin, suite, action) Logger.close() @@ -289,4 +293,3 @@ def main (): if __name__ == '__main__': main() -