From: Chris Lamb <lamby@debian.org>
Date: Fri, 30 Oct 2009 13:11:05 +0000 (+0000)
Subject: Fix component references in upload component error codepaths.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=34ad6c138875f25b3a9741743f3b021e24b29dc8;p=dak.git

Fix component references in upload component error codepaths.

Signed-off-by: Chris Lamb <lamby@debian.org>
---

diff --git a/daklib/queue.py b/daklib/queue.py
index 593f0fe4..b38b4b23 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -755,7 +755,7 @@ class Upload(object):
 
         # Validate the component
         if not get_component(entry["component"], session):
-            self.rejects.append("file '%s' has unknown component '%s'." % (f, component))
+            self.rejects.append("file '%s' has unknown component '%s'." % (f, entry["component"]))
             return
 
         # See if the package is NEW
@@ -770,7 +770,7 @@ class Upload(object):
         location = cnf["Dir::Pool"]
         l = get_location(location, entry["component"], archive, session)
         if l is None:
-            self.rejects.append("[INTERNAL ERROR] couldn't determine location (Component: %s, Archive: %s)" % (component, archive))
+            self.rejects.append("[INTERNAL ERROR] couldn't determine location (Component: %s, Archive: %s)" % (entry["component"], archive))
             entry["location id"] = -1
         else:
             entry["location id"] = l.location_id