]> err.no Git - dak/commitdiff
Fix component references in upload component error codepaths.
authorChris Lamb <lamby@debian.org>
Fri, 30 Oct 2009 13:11:05 +0000 (13:11 +0000)
committerChris Lamb <lamby@debian.org>
Fri, 30 Oct 2009 14:29:57 +0000 (14:29 +0000)
Signed-off-by: Chris Lamb <lamby@debian.org>
daklib/queue.py

index 593f0fe46e06deef9ad8b7bd7aba6e096ac071eb..b38b4b23346e5ffc7a26d977df5b6f22af973bd1 100755 (executable)
@@ -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