From: Joerg Jaspert Date: Sat, 24 Jan 2009 15:32:25 +0000 (+0100) Subject: Various X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50f96efaa4536efc0636f182272ed5f57de0ebf2;p=dak Various remove a few trailing ; Signed-off-by: Joerg Jaspert --- diff --git a/dak/new_security_install.py b/dak/new_security_install.py index 856428e0..4071b78a 100755 --- a/dak/new_security_install.py +++ b/dak/new_security_install.py @@ -26,7 +26,7 @@ from daklib import utils from daklib import database import apt_pkg, os, sys, pwd, time, re, commands -re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$"); +re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$") Cnf = None Options = None diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 737472af..fae2fffb 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -1303,14 +1303,14 @@ def is_stableupdate (): def do_stableupdate (summary, short_summary): print "Moving to PROPOSED-UPDATES holding area." - Logger.log(["Moving to proposed-updates", pkg.changes_file]); + Logger.log(["Moving to proposed-updates", pkg.changes_file]) - Upload.dump_vars(Cnf["Dir::Queue::ProposedUpdates"]); + Upload.dump_vars(Cnf["Dir::Queue::ProposedUpdates"]) move_to_dir(Cnf["Dir::Queue::ProposedUpdates"], perms=0664) # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary; - Upload.check_override(); + Upload.Subst["__SUMMARY__"] = summary + Upload.check_override() ################################################################################ @@ -1332,14 +1332,14 @@ def is_oldstableupdate (): def do_oldstableupdate (summary, short_summary): print "Moving to OLDSTABLE-PROPOSED-UPDATES holding area." - Logger.log(["Moving to oldstable-proposed-updates", pkg.changes_file]); + Logger.log(["Moving to oldstable-proposed-updates", pkg.changes_file]) - Upload.dump_vars(Cnf["Dir::Queue::OldProposedUpdates"]); + Upload.dump_vars(Cnf["Dir::Queue::OldProposedUpdates"]) move_to_dir(Cnf["Dir::Queue::OldProposedUpdates"], perms=0664) # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary; - Upload.check_override(); + Upload.Subst["__SUMMARY__"] = summary + Upload.check_override() ################################################################################ diff --git a/dak/update_db.py b/dak/update_db.py index e9f8441d..d4aefe24 100755 --- a/dak/update_db.py +++ b/dak/update_db.py @@ -64,7 +64,7 @@ Updates dak's database schema to the lastest version. You should disable crontab name TEXT UNIQUE NOT NULL, value TEXT );""") - c.execute("INSERT INTO config VALUES ( nextval('config_id_seq'), 'db_revision', '0')"); + c.execute("INSERT INTO config VALUES ( nextval('config_id_seq'), 'db_revision', '0')") self.db.commit() except psycopg2.ProgrammingError: @@ -85,7 +85,7 @@ Updates dak's database schema to the lastest version. You should disable crontab try: c = self.db.cursor() - q = c.execute("SELECT value FROM config WHERE name = 'db_revision';"); + q = c.execute("SELECT value FROM config WHERE name = 'db_revision';") return c.fetchone()[0] except psycopg2.ProgrammingError: diff --git a/daklib/queue.py b/daklib/queue.py index f4e4b908..3ac52b34 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -345,7 +345,7 @@ class Upload: if not changes.has_key("distribution") or not isinstance(changes["distribution"], DictType): changes["distribution"] = {} - override_summary =""; + override_summary ="" file_keys = files.keys() file_keys.sort() for file_entry in file_keys: @@ -1033,7 +1033,8 @@ SELECT s.version, su.suite_name FROM source s, src_associations sa, suite su # for example, the package was in potato but had an -sa # upload in woody. So we need to choose the right one. - x = ql[0]; # default to something sane in case we don't match any or have only one + # default to something sane in case we don't match any or have only one + x = ql[0] if len(ql) > 1: for i in ql: @@ -1054,7 +1055,8 @@ SELECT s.version, su.suite_name FROM source s, src_associations sa, suite su actual_size = os.stat(old_file)[stat.ST_SIZE] found = old_file suite_type = x[2] - dsc_files[dsc_file]["files id"] = x[3]; # need this for updating dsc_files in install() + # need this for updating dsc_files in install() + dsc_files[dsc_file]["files id"] = x[3] # See install() in process-accepted... self.pkg.orig_tar_id = x[3] self.pkg.orig_tar_gz = old_file diff --git a/daklib/utils.py b/daklib/utils.py index 0d83b341..9e26e9e7 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -1118,7 +1118,7 @@ on error.""" return "%s: tainted filename" % (filename) # Invoke gpgv on the file - status_read, status_write = os.pipe(); + status_read, status_write = os.pipe() cmd = "gpgv --status-fd %s --keyring /dev/null %s" % (status_write, filename) (_, status, _) = gpgv_get_status_output(cmd, status_read, status_write) @@ -1190,7 +1190,7 @@ used.""" return None # Build the command line - status_read, status_write = os.pipe(); + status_read, status_write = os.pipe() cmd = "gpgv --status-fd %s %s %s %s" % ( status_write, gpg_keyring_args(keyrings), sig_filename, data_filename)