Merge commit 'djpig/process-upload'

diff --git a/dak/dakdb/update22.py b/dak/dakdb/update22.py
index 4f95262debd1f72d2dceed90ab63225de828604a..b6fbbb447b37ac776085ca91efeb1449f63fd21f 100755 (executable)
--- a/dak/dakdb/update22.py
+++ b/dak/dakdb/update22.py
@@ -98,7 +98,7 @@ def do_update(self):
                        ON DELETE CASCADE""")
 
 
-        c.execute("""ALTER TABLE suite DROP CONSTRAINT suite_policy_queue_fkey""")
+        c.execute("""ALTER TABLE suite DROP CONSTRAINT suite_policy_queue_id_fkey""")
 
         c.execute("""UPDATE suite
     SET policy_queue_id = (SELECT policy_queue.id FROM policy_queue

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/dbconn.py b/daklib/dbconn.py
index 7add55ff61eafbdded2aa3c8887c75f9df474630..779c0e2936a3fa270fe68b290c22b9d614d3f2d6 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2088,7 +2088,7 @@ def add_deb_to_db(u, filename, session=None):
     filename = entry["pool name"] + filename
     fullpath = os.path.join(cnf["Dir::Pool"], filename)
     if not entry.get("location id", None):
-        entry["location id"] = get_location(cnf["Dir::Pool"], entry["component"], utils.where_am_i(), session).location_id
+        entry["location id"] = get_location(cnf["Dir::Pool"], entry["component"], session=session).location_id
 
     if not entry.get("files id", None):
         poolfile = add_poolfile(filename, entry, entry["location id"], session)

diff --git a/daklib/queue.py b/daklib/queue.py
index 15a8395841b35e1134f2ae06ed40ebbe8639134b..5f9fccb4073dfc8e5854c552ddd262ca7c791ec6 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -720,7 +720,6 @@ class Upload(object):
     def per_suite_file_checks(self, f, suite, session):
         cnf = Config()
         entry = self.pkg.files[f]
-        archive = utils.where_am_i()
 
         # Skip byhand
         if entry.has_key("byhand"):
@@ -764,9 +763,9 @@ class Upload(object):
 
         # Determine the location
         location = cnf["Dir::Pool"]
-        l = get_location(location, entry["component"], archive, session)
+        l = get_location(location, entry["component"], session=session)
         if l is None:
-            self.rejects.append("[INTERNAL ERROR] couldn't determine location (Component: %s, Archive: %s)" % (entry["component"], archive))
+            self.rejects.append("[INTERNAL ERROR] couldn't determine location (Component: %)" % entry["component"])
             entry["location id"] = -1
         else:
             entry["location id"] = l.location_id
@@ -817,7 +816,10 @@ class Upload(object):
 
         try:
             dbc = session.query(DBChange).filter_by(changesname=base_filename).one()
-            if dbc.in_queue is not None and dbc.in_queue.queue_name != 'unchecked':
+            # if in the pool or in a queue other than unchecked, reject
+            if (dbc.in_queue is None) \
+                   or (dbc.in_queue is not None
+                       and dbc.in_queue.queue_name != 'unchecked'):
                 self.rejects.append("%s file already known to dak" % base_filename)
         except NoResultFound, e:
             # not known, good

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)