do not support multi-archive mode in process-upload

We don't actually have any multi-archive machines at the moment
and removing it makes test-setups easier to do.

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

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 e1ade39e12a717e660cf7c5f44598b52432efedb..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