Merge branch 'master' into deb-src-3.0-sqla

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index 9f244963dc7cdf8e6ac29e24b350197e11ac240e..cfee2c7eb148bcd67b292b3e0fed3166e6ee175a 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -48,6 +48,9 @@ from regexes import re_html_escaping, html_escaping, re_single_line_field, \
                     re_parse_maintainer, re_taint_free, re_gpg_uid, \
                     re_re_mark, re_whitespace_comment, re_issource
 
+from srcformats import srcformats
+from collections import defaultdict
+
 ################################################################################
 
 default_config = "/etc/dak/dak.conf"     #: default dak config, defines host properties
@@ -352,75 +355,58 @@ 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
     # announced
-    has_native_tar = 0
-    has_native_tar_gz = 0
-    has_orig_tar = 0
-    has_orig_tar_gz = 0
-    has_more_orig_tar = 0
-    has_debian_tar = 0
-    has_debian_diff = 0
+    has = defaultdict(lambda: 0)
+
+    ftype_lookup = (
+        (r'orig.tar.gz',                    ('orig_tar_gz', 'orig_tar')),
+        (r'diff.gz',                        ('debian_diff',)),
+        (r'tar.gz',                         ('native_tar_gz', 'native_tar')),
+        (r'debian\.tar\.(gz|bz2|lzma)',     ('debian_tar',)),
+        (r'orig\.tar\.(gz|bz2|lzma)',       ('orig_tar',)),
+        (r'tar\.(gz|bz2|lzma)',             ('native_tar',)),
+        (r'orig-.+\.tar\.(gz|bz2|lzma)',    ('more_orig_tar',)),
+    )
+
     for f in dsc_files.keys():
         m = re_issource.match(f)
         if not m:
             rejmsg.append("%s: %s in Files field not recognised as source."
                           % (dsc_filename, f))
             continue
-        ftype = m.group(3)
-        if ftype == "orig.tar.gz":
-            has_orig_tar_gz += 1
-            has_orig_tar += 1
-        elif ftype == "diff.gz":
-            has_debian_diff += 1
-        elif ftype == "tar.gz":
-            has_native_tar_gz += 1
-            has_native_tar += 1
-        elif re.match(r"debian\.tar\.(gz|bz2|lzma)", ftype):
-            has_debian_tar += 1
-        elif re.match(r"orig\.tar\.(gz|bz2|lzma)", ftype):
-            has_orig_tar += 1
-        elif re.match(r"tar\.(gz|bz2|lzma)", ftype):
-            has_native_tar += 1
-        elif re.match(r"orig-.+\.tar\.(gz|bz2|lzma)", ftype):
-            has_more_orig_tar += 1
-        else:
+
+        # Populate 'has' dictionary by resolving keys in lookup table
+        matched = False
+        for regex, keys in ftype_lookup:
+            if re.match(regex, m.group(3)):
+                matched = True
+                for key in keys:
+                    has[key] += 1
+                break
+
+        # File does not match anything in lookup table; reject
+        if not matched:
             reject("%s: unexpected source file '%s'" % (dsc_filename, f))
-    if has_orig_tar > 1:
-        rejmsg.append("%s: lists multiple .orig tarballs." % (dsc_filename))
-    if has_native_tar > 1:
-        rejmsg.append("%s: lists multiple native tarballs." % (dsc_filename))
-    if has_debian_tar > 1 or has_debian_diff > 1:
-        rejmsg.append("%s: lists multiple debian diff/tarballs." % (dsc_filename))
-    if dsc["format"] == "1.0":
-        if not (has_native_tar_gz or (has_orig_tar_gz and has_debian_diff)):
-            rejmsg.append("%s: no .tar.gz or .orig.tar.gz+.diff.gz in "
-                          "'Files' field." % (dsc_filename))
-        if (has_orig_tar_gz != has_orig_tar) or \
-           (has_native_tar_gz != has_native_tar) or \
-           has_debian_tar or has_more_orig_tar:
-            rejmsg.append("%s: contains source files not allowed in format 1.0"
-                          % (dsc_filename))
-    elif re.match(r"3\.\d+ \(native\)", dsc["format"]):
-        if not has_native_tar:
-            rejmsg.append("%s: lack required files for format 3.x (native)."
-                          % (dsc_filename))
-        if has_orig_tar or has_debian_diff or has_debian_tar or \
-           has_more_orig_tar:
-            rejmsg.append("%s: contains source files not allowed in "
-                          "format '3.x (native)'" % (dsc_filename))
-    elif re.match(r"3\.\d+ \(quilt\)", dsc["format"]):
-        if not(has_orig_tar and has_debian_tar):
-            rejmsg.append("%s: lack required files for format "
-                          "'3.x (quilt)'." % (dsc_filename))
-        if has_debian_diff or has_native_tar:
-            rejmsg.append("%s: contains source files not allowed in format "
-                          "3.x (quilt)" % (dsc_filename))
+
+    # Check for multiple files
+    for file_type in ('orig_tar', 'native_tar', 'debian_tar', 'debian_diff'):
+        if has[file_type] > 1:
+            rejmsg.append("%s: lists multiple %s" % (dsc_filename, file_type))
+
+    # Source format specific tests
+    for format in srcformats:
+        if format.re_format.match(dsc['format']):
+            rejmsg.extend([
+                '%s: %s' % (dsc_filename, x) for x in format.reject_msgs(has)
+            ])
+            break
 
     return rejmsg