From f0c875ddc69f384bf2600fa342fbac30dc82fda7 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sat, 31 Oct 2009 13:35:21 +0000 Subject: [PATCH] Small fixes Signed-off-by: Frank Lichtenheld --- dak/process_upload.py | 6 +++--- daklib/changes.py | 2 +- daklib/queue_install.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dak/process_upload.py b/dak/process_upload.py index 97117b8a..2f904c35 100755 --- a/dak/process_upload.py +++ b/dak/process_upload.py @@ -196,7 +196,7 @@ def usage (exit_code=0): ############################################################################### -def action(u, dbc): +def action(u): cnf = Config() holding = Holding() session = DBConn().session() @@ -257,12 +257,12 @@ def action(u, dbc): # so, we skip the policy queue, otherwise we go there. divert = package_to_suite(u, suite.suite_name, session=session) if divert: - print "%s for %s\n%s%s" % ( su.policy_queue.queue_name.upper(), + print "%s for %s\n%s%s" % ( suite.policy_queue.queue_name.upper(), ", ".join(u.pkg.changes["distribution"].keys()), pi, summary) queuekey = "P" prompt = "[P]olicy, Skip, Quit ?" - policyqueue = su.policy_queue + policyqueue = suite.policy_queue if Options["Automatic"]: answer = 'P' break diff --git a/daklib/changes.py b/daklib/changes.py index 4d23f9fa..3f305c9c 100755 --- a/daklib/changes.py +++ b/daklib/changes.py @@ -205,7 +205,7 @@ class Changes(object): multivalues[key] = self.changes[key].keys() session.execute( - """INSERT INTO known_changes + """INSERT INTO changes (changesname, seen, source, binaries, architecture, version, distribution, urgency, maintainer, fingerprint, changedby, date) VALUES (:changesfile,:filetime,:source,:binary, :architecture, diff --git a/daklib/queue_install.py b/daklib/queue_install.py index d6b651b2..e6aee579 100644 --- a/daklib/queue_install.py +++ b/daklib/queue_install.py @@ -34,14 +34,14 @@ from daklib.config import Config ################################################################################ def package_to_suite(u, suite_name, session): - if not u.pkg.changes["distribution"].has_key(suite): + if not u.pkg.changes["distribution"].has_key(suite_name): return False ret = True if not u.pkg.changes["architecture"].has_key("source"): q = session.query(SrcAssociation.sa_id) - q = q.join(Suite).filter_by(suite_name=suite) + q = q.join(Suite).filter_by(suite_name=suite_name) q = q.join(DBSource).filter_by(source=u.pkg.changes['source']) q = q.filter_by(version=u.pkg.changes['version']).limit(1) -- 2.39.5