From fee16eb149c8f2a45fb4bf269e602622c32bf525 Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Sat, 3 May 2008 14:54:56 +0100 Subject: [PATCH] clean up pychecker warnings --- dak/control_suite.py | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dak/control_suite.py b/dak/control_suite.py index 5291b595..43b396ba 100644 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -82,8 +82,7 @@ def get_id (package, version, architecture): if len(ql) > 1: daklib.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] ####################################################################################### @@ -119,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") @@ -163,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 @@ -181,7 +180,7 @@ def process_file (file, suite, action): 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)) + 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)) @@ -190,7 +189,7 @@ def process_file (file, suite, action): 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 @@ -202,7 +201,7 @@ def process_file (file, suite, action): 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)) + 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)) @@ -280,8 +279,8 @@ def main (): else: Logger = daklib.logging.Logger(Cnf, "control-suite") if file_list: - for file in file_list: - process_file(daklib.utils.open_file(file), suite, action) + for f in file_list: + process_file(daklib.utils.open_file(f), suite, action) else: process_file(sys.stdin, suite, action) Logger.close() -- 2.39.2