From: Mark Hymers Date: Sat, 3 May 2008 13:56:31 +0000 (+0100) Subject: clean up pychecker warnings X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ae579a9d73097696c36fcbaca5ea5751ca25579d;p=dak.git clean up pychecker warnings --- diff --git a/dak/control_suite.py b/dak/control_suite.py index 43b396ba..63a0386b 100644 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -43,9 +43,9 @@ import pg, sys import apt_pkg -import daklib.database -import daklib.logging -import daklib.utils +import daklib.database as database +import daklib.logging as logging +import daklib.utils as 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"), @@ -252,35 +252,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 a suite other than testing.") 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()