From de3991e803cc6f69d5eee0fbf75daf95b0f9969d Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Mon, 5 Dec 2005 05:31:48 +0000 Subject: [PATCH] fix up syntax errors and similar thinkos --- jennifer | 30 ++++++++++++------------------ katie.conf-security | 2 +- katie.py | 16 ++++++++++++---- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/jennifer b/jennifer index 08cc5533..1f69aada 100755 --- a/jennifer +++ b/jennifer @@ -2,7 +2,7 @@ # Checks Debian packages from Incoming # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 James Troup -# $Id: jennifer,v 1.63 2005-12-05 05:08:10 ajt Exp $ +# $Id: jennifer,v 1.64 2005-12-05 05:31:48 ajt Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,7 +45,7 @@ re_strip_revision = re.compile(r"-([^-]+)$"); ################################################################################ # Globals -jennifer_version = "$Revision: 1.63 $"; +jennifer_version = "$Revision: 1.64 $"; Cnf = None; Options = None; @@ -1121,26 +1121,29 @@ def accept (summary, short_summary): def move_to_dir (dest, perms=0660, changesperms=0664): utils.move (pkg.changes_file, dest, perms=changesperms); + file_keys = files.keys(); for file in file_keys: utils.move (file, dest, perms=perms); ################################################################################ def is_unembargo (): + q = Katie.projectB.query( + "SELECT package FROM disembargo WHERE package = '%s' AND version = '%s'" % + (changes["source"], changes["version"])) + ql = q.getresult() + if ql: + return 1 + if pkg.directory == Cnf["Dir::Queue::Disembargo"]: if changes["architecture"].has_key("source"): if Options["No-Action"]: return 1 Katie.projectB.query( "INSERT INTO disembargo (package, version) VALUES ('%s', '%s')" % - (changes["package"], changes["version"])) + (changes["source"], changes["version"])) + return 1 - q = Katie.projectB.query( - "SELECT package FROM disembargo WHERE package = '%s' AND version = '%s'" % - (changes["package"], changes["version"])) - ql = q.getresult() - if ql: - return 1 return 0 def queue_unembargo (summary): @@ -1148,9 +1151,6 @@ def queue_unembargo (summary): Logger.log(["Moving to unembargoed", pkg.changes_file]); Katie.dump_vars(Cnf["Dir::Queue::Unembargoed"]); - - file_keys = files.keys(); - move_to_dir(Cnf["Dir::Queue::Unembargoed"]) Katie.queue_build("unembargoed", Cnf["Dir::Queue::Unembargoed"]) @@ -1168,9 +1168,6 @@ def queue_embargo (summary): Logger.log(["Moving to embargoed", pkg.changes_file]); Katie.dump_vars(Cnf["Dir::Queue::Embargoed"]); - - file_keys = files.keys(); - move_to_dir(Cnf["Dir::Queue::Embargoed"]) Katie.queue_build("embargoed", Cnf["Dir::Queue::Embargoed"]) @@ -1191,9 +1188,6 @@ def do_byhand (summary): Logger.log(["Moving to byhand", pkg.changes_file]); Katie.dump_vars(Cnf["Dir::Queue::Byhand"]); - - file_keys = files.keys(); - move_to_dir(Cnf["Dir::Queue::Byhand"]) # Check for override disparities diff --git a/katie.conf-security b/katie.conf-security index 19b9bd28..e5ef6868 100644 --- a/katie.conf-security +++ b/katie.conf-security @@ -247,7 +247,7 @@ Dir Embargoed "/org/security.debian.org/queue/embargoed/"; Unembargoed "/org/security.debian.org/queue/unembargoed/"; - Disembargo "/org/security.debian.org/queue/uncheckecked-disembargo/"; + Disembargo "/org/security.debian.org/queue/unchecked-disembargo/"; }; }; diff --git a/katie.py b/katie.py index f11ef661..50004503 100644 --- a/katie.py +++ b/katie.py @@ -2,7 +2,7 @@ # Utility functions for katie # Copyright (C) 2001, 2002, 2003, 2004, 2005 James Troup -# $Id: katie.py,v 1.57 2005-12-05 03:45:12 ajt Exp $ +# $Id: katie.py,v 1.58 2005-12-05 05:31:48 ajt Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -455,8 +455,16 @@ distribution."""; ########################################################################### def queue_build (self, queue, path): + Cnf = self.Cnf + Subst = self.Subst + files = self.pkg.files + changes = self.pkg.changes + changes_file = self.pkg.changes_file + dsc = self.pkg.dsc + file_keys = files.keys() + ## Special support to enable clean auto-building of queued packages - queue_id = get_or_set_queue_id(queue) + queue_id = db_access.get_or_set_queue_id(queue) self.projectB.query("BEGIN WORK"); for suite in changes["distribution"].keys(): @@ -476,7 +484,7 @@ distribution."""; # Create a symlink to it os.symlink(src, dest); # Add it to the list of packages for later processing by apt-ftparchive - self.projectB.query("INSERT INTO queue_build (suite, queue, filename, in_queue) VALUES (%s, queue_id, '%s', 't')" % (suite_id, dest)); + self.projectB.query("INSERT INTO queue_build (suite, queue, filename, in_queue) VALUES (%s, %s, '%s', 't')" % (suite_id, queue_id, dest)); # If the .orig.tar.gz is in the pool, create a symlink to # it (if one doesn't already exist) if self.pkg.orig_tar_id: @@ -495,7 +503,7 @@ distribution."""; src = os.path.join(ql[0][0], ql[0][1]); os.symlink(src, dest); # Add it to the list of packages for later processing by apt-ftparchive - self.projectB.query("INSERT INTO queue_build (suite, queue, filename, in_queue) VALUES (%s, queue_id, '%s', 't')" % (suite_id, dest)); + self.projectB.query("INSERT INTO queue_build (suite, queue, filename, in_queue) VALUES (%s, %s, '%s', 't')" % (suite_id, queue_id, dest)); # if it does, update things to ensure it's not removed prematurely else: self.projectB.query("UPDATE queue_build SET in_queue = 't', last_used = NULL WHERE filename = '%s' AND suite = %s" % (dest, suite_id)); -- 2.39.5