X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=c6084d8bb2bf3e958714acff62cd9897b096f4eb;hb=c85fbd74d65ed0c0878d9ba1125186ec151cbe4e;hp=43b396ba8aea267ff98f26dae6c02e46dcb664f6;hpb=fee16eb149c8f2a45fb4bf269e602622c32bf525;p=dak.git diff --git a/dak/control_suite.py b/dak/control_suite.py old mode 100644 new mode 100755 index 43b396ba..c6084d8b --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Manipulate suite tags +""" Manipulate suite tags """ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 James Troup # This program is free software; you can redistribute it and/or modify @@ -43,9 +43,9 @@ import pg, sys import apt_pkg -import daklib.database -import daklib.logging -import daklib.utils +from daklib import database +from daklib import logging +from daklib import utils ####################################################################################### @@ -77,10 +77,10 @@ def get_id (package, version, architecture): ql = q.getresult() if not ql: - daklib.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: - daklib.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 return ql[0][0] @@ -109,7 +109,7 @@ def set_suite (file, suite_id): for line in lines: split_line = line.strip().split() if len(split_line) != 3: - daklib.utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) + utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) continue key = " ".join(split_line) desired[key] = "" @@ -144,7 +144,7 @@ def set_suite (file, suite_id): def process_file (file, suite, action): - suite_id = daklib.database.get_suite_id(suite) + suite_id = database.get_suite_id(suite) if action == "set": set_suite (file, suite_id) @@ -157,7 +157,7 @@ def process_file (file, suite, action): for line in lines: split_line = line.strip().split() if len(split_line) != 3: - daklib.utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) + utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1])) continue (package, version, architecture) = split_line @@ -177,13 +177,13 @@ def process_file (file, suite, action): # Take action if action == "add": if assoication_id: - daklib.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, pkid)) elif action == "remove": if assoication_id == None: - daklib.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)) @@ -198,13 +198,13 @@ def process_file (file, suite, action): # Take action if action == "add": if assoication_id: - daklib.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, pkid)) elif action == "remove": if assoication_id == None: - daklib.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 = daklib.database.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() @@ -232,7 +232,7 @@ def get_list (suite): def main (): global Cnf, projectB, Logger - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('a',"add","Control-Suite::Options::Add", "HasArg"), ('h',"help","Control-Suite::Options::Help"), @@ -244,7 +244,11 @@ def main (): 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) + 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"]: @@ -252,35 +256,35 @@ def main (): projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"],int(Cnf["DB::Port"])) - daklib.database.init(Cnf, projectB) + 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 daklib.database.get_suite_id(suite) == -1: - daklib.utils.fubar("Unknown suite '%s'." %(suite)) + if database.get_suite_id(suite) == -1: + utils.fubar("Unknown suite '%s'." %(suite)) else: if action: - daklib.utils.fubar("Can only perform one action at a time.") + utils.fubar("Can only perform one action at a time.") action = i # Need an action... if action == None: - daklib.utils.fubar("No action specified.") + utils.fubar("No action specified.") # Safety/Sanity check if action == "set" and suite not in ["testing", "etch-m68k"]: - daklib.utils.fubar("Will not reset a suite other than testing.") + utils.fubar("Will not reset suite %s" % (suite)) if action == "list": get_list(suite) else: - Logger = daklib.logging.Logger(Cnf, "control-suite") + Logger = logging.Logger(Cnf, "control-suite") if file_list: for f in file_list: - process_file(daklib.utils.open_file(f), suite, action) + process_file(utils.open_file(f), suite, action) else: process_file(sys.stdin, suite, action) Logger.close()