Small fixes

Signed-off-by: Frank Lichtenheld <djpig@debian.org>

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 97117b8ad59e86aac54eaec7f29e327bb075df3c..2f904c3596a283355cd4c8d527771c20ac21d523 100755 (executable)
--- 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 4d23f9fadac9cf8b5152f8a0319657cb5c8ffb85..3f305c9c0fe4cbc7f3082bd739e38400e0aebf6a 100755 (executable)
--- 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 d6b651b2707e8ed60d8d388318b35275dfc09215..e6aee579faaaba1a61f9efd8c2f3ca4a75df9a93 100644 (file)
--- 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)