queue.py: fix more error handling code

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index 165b7088e2c01a4c762d856c1e0e846427f1147b..8d814e86c077828c2e7187f3de2e04416cb1d47a 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -78,6 +78,7 @@ def get_type(f, session):
     elif re_source_ext.match(f["type"]):
         file_type = "dsc"
     else:
+        file_type = f["type"]
         utils.fubar("invalid type (%s) for new.  Dazed, confused and sure as heck not continuing." % (file_type))
 
     # Validate the override type
@@ -775,7 +776,7 @@ class Upload(object):
         location = cnf["Dir::Pool"]
         l = get_location(location, entry["component"], session=session)
         if l is None:
-            self.rejects.append("[INTERNAL ERROR] couldn't determine location (Component: %)" % entry["component"])
+            self.rejects.append("[INTERNAL ERROR] couldn't determine location (Component: %s)" % entry["component"])
             entry["location id"] = -1
         else:
             entry["location id"] = l.location_id