Simplify src_format handling

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index 35d47429858e69613b50e1eebaf03e41f28594d1..f912bef19aec4a97470859463e7eae627b1bf65c 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1217,7 +1217,7 @@ class Upload(object):
 
         # Only a limited list of source formats are allowed in each suite
         for dist in self.pkg.changes["distribution"].keys():
-            allowed = [ x.format_name for x in get_suite_src_formats(dist, session) ]
+            allowed = [ x.format_name for x in dist.srcformats ]
             if self.pkg.dsc["format"] not in allowed:
                 self.rejects.append("%s: source format '%s' not allowed in %s (accepted: %s) " % (dsc_filename, self.pkg.dsc["format"], dist, ", ".join(allowed)))
 
@@ -1318,8 +1318,8 @@ class Upload(object):
         # Extract the source
         try:
             unpacked = UnpackedSource(dsc_filename)
-        except:
-            self.rejects.append("'dpkg-source -x' failed for %s." % dsc_filename)
+        except Exception, e:
+            self.rejects.append("'dpkg-source -x' failed for %s. (%s)" % (dsc_filename, str(e)))
             return
 
         if not cnf.Find("Dir::BTSVersionTrack"):