[dak/master 35/50] 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>
---
daklib/dbconn.py | 2 +-
daklib/queue.py | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 7add55f..779c0e2 100755
--- 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 e1ade39..5f9fccb 100755
--- 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
--
1.6.3.3
Reply to: