X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=b22f4e05644425a4445bf8c95c30267f2f54088b;hb=e2ae71066cbb134753d7bfceb16e87d0b76dfd6e;hp=64e82534200e98d36b7d23098fa004465c198d3a;hpb=0ca9669a25a3199eb5d9b11cf6faf3736e65000c;p=dak.git diff --git a/dak/control_suite.py b/dak/control_suite.py index 64e82534..b22f4e05 100755 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -43,9 +43,9 @@ import pg, sys import apt_pkg -import dak.lib.database as database -import dak.lib.logging as logging -import dak.lib.utils as utils +import daklib.database +import daklib.logging +import daklib.utils ####################################################################################### @@ -77,10 +77,10 @@ def get_id (package, version, architecture): ql = q.getresult() if not ql: - utils.warn("Couldn't find '%s~%s~%s'." % (package, version, architecture)) + daklib.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)) + daklib.utils.warn("Found more than one match for '%s~%s~%s'." % (package, version, architecture)) return None id = ql[0][0] return id @@ -110,7 +110,7 @@ def set_suite (file, suite_id): for line in lines: split_line = line.strip().split() if len(split_line) != 3: - utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) + daklib.utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) continue key = " ".join(split_line) desired[key] = "" @@ -145,7 +145,7 @@ def set_suite (file, suite_id): def process_file (file, suite, action): - suite_id = database.get_suite_id(suite) + suite_id = daklib.database.get_suite_id(suite) if action == "set": set_suite (file, suite_id) @@ -158,7 +158,7 @@ def process_file (file, suite, action): for line in lines: split_line = line.strip().split() if len(split_line) != 3: - utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) + daklib.utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) continue (package, version, architecture) = split_line @@ -178,13 +178,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)) + daklib.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)) elif action == "remove": if assoication_id == None: - utils.warn("'%s~%s~%s' doesn't exist in suite %s." % (package, version, architecture, suite)) + daklib.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)) @@ -199,13 +199,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)) + daklib.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)) elif action == "remove": if assoication_id == None: - utils.warn("'%s~%s~%s' doesn't exist in suite %s." % (package, version, architecture, suite)) + daklib.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)) @@ -215,7 +215,7 @@ def process_file (file, suite, action): ####################################################################################### def get_list (suite): - suite_id = database.get_suite_id(suite) + suite_id = daklib.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() @@ -233,7 +233,7 @@ def get_list (suite): def main (): global Cnf, projectB, Logger - Cnf = utils.get_conf() + Cnf = daklib.utils.get_conf() Arguments = [('a',"add","Control-Suite::Options::Add", "HasArg"), ('h',"help","Control-Suite::Options::Help"), @@ -253,35 +253,35 @@ def main (): projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"],int(Cnf["DB::Port"])) - database.init(Cnf, projectB) + daklib.database.init(Cnf, projectB) action = None for i in ("add", "list", "remove", "set"): 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)) + if daklib.database.get_suite_id(suite) == -1: + daklib.utils.fubar("Unknown suite '%s'." %(suite)) else: if action: - utils.fubar("Can only perform one action at a time.") + daklib.utils.fubar("Can only perform one action at a time.") action = i # Need an action... if action == None: - utils.fubar("No action specified.") + daklib.utils.fubar("No action specified.") # Safety/Sanity check if action == "set" and suite != "testing": - utils.fubar("Will not reset a suite other than testing.") + daklib.utils.fubar("Will not reset a suite other than testing.") if action == "list": get_list(suite) else: - Logger = logging.Logger(Cnf, "control-suite") + Logger = daklib.logging.Logger(Cnf, "control-suite") if file_list: for file in file_list: - process_file(utils.open_file(file), suite, action) + process_file(daklib.utils.open_file(file), suite, action) else: process_file(sys.stdin, suite, action) Logger.close()