Require source formats to have a name and interpolate it when returning msgs

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index ea2f8b7fda427e136bf037d5f22d73468bae4814..1c7aa802692cba07fdf2ca2b9908b02457044b65 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -354,9 +354,10 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
     rejmsg = []
 
     # Parse the file if needed
-    if dsc == None:
+    if dsc is None:
         dsc = parse_changes(dsc_filename, signing_rules=1);
-    if dsc_files == None:
+
+    if dsc_files is None:
         dsc_files = build_file_list(dsc, is_a_dsc=1)
 
     # Ensure .dsc lists proper set of source files according to the format
@@ -402,8 +403,7 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
 
     for format in srcformats:
         if format.re_format.match(dsc['format']):
-            rejmsg.extend(format.reject_msgs(
-                dsc_filename,
+            msgs = format.reject_msgs(
                 has_native_tar,
                 has_native_tar_gz,
                 has_debian_tar,
@@ -411,7 +411,8 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
                 has_orig_tar,
                 has_orig_tar_gz,
                 has_more_orig_tar
-            ))
+            )
+            rejmsg.extend(['%s: %s' % (dsc_filename, x) for x in msgs])
             break
 
     return rejmsg