]> git.decadent.org.uk Git - dak.git/blobdiff - daklib/utils.py
Fix utils.build_file_list() for 3.x source packages
[dak.git] / daklib / utils.py
index 841e8d3a6da3f014df5bf4f60a1e57bce9125b96..9f244963dc7cdf8e6ac29e24b350197e11ac240e 100755 (executable)
@@ -45,8 +45,8 @@ from dak_exceptions import *
 from textutils import fix_maintainer
 from regexes import re_html_escaping, html_escaping, re_single_line_field, \
                     re_multi_line_field, re_srchasver, re_verwithext, \
-                    re_parse_maintainer, re_taint_free, re_gpg_uid, re_re_mark, \
-                    re_whitespace_comment
+                    re_parse_maintainer, re_taint_free, re_gpg_uid, \
+                    re_re_mark, re_whitespace_comment, re_issource
 
 ################################################################################
 
@@ -332,6 +332,100 @@ def check_size(where, files):
 
 ################################################################################
 
+def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
+    """
+    Verify that the files listed in the Files field of the .dsc are
+    those expected given the announced Format.
+
+    @type dsc_filename: string
+    @param dsc_filename: path of .dsc file
+
+    @type dsc: dict
+    @param dsc: the content of the .dsc parsed by C{parse_changes()}
+
+    @type dsc_files: dict
+    @param dsc_files: the file list returned by C{build_file_list()}
+
+    @rtype: list
+    @return: all errors detected
+    """
+    rejmsg = []
+
+    # Parse the file if needed
+    if dsc == None:
+        dsc = parse_changes(dsc_filename, signing_rules=1);
+    if dsc_files == 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
+    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:
+            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))
+
+    return rejmsg
+
+################################################################################
+
 def check_hash_fields(what, manifest):
     """
     check_hash_fields ensures that there are no checksum fields in the
@@ -394,7 +488,12 @@ def parse_checksums(where, files, manifest, hashname):
     for line in manifest[field].split('\n'):
         if not line:
             break
-        checksum, size, checkfile = line.strip().split(' ')
+        clist = line.strip().split(' ')
+        if len(clist) == 3:
+            checksum, size, checkfile = clist
+        else:
+            rejmsg.append("Cannot parse checksum line [%s]" % (line))
+            continue
         if not files.has_key(checkfile):
         # TODO: check for the file's entry in the original files dict, not
         # the one modified by (auto)byhand and other weird stuff
@@ -437,10 +536,10 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"):
         format = format[:2]
 
     if is_a_dsc:
-        # format = (1,0) are the only formats we currently accept,
         # format = (0,0) are missing format headers of which we still
         # have some in the archive.
-        if format != (1,0) and format != (0,0):
+        if format != (1,0) and format != (0,0) and \
+           format != (3,0,"quilt") and format != (3,0,"native"):
             raise UnknownFormatError, "%s" % (changes.get("format","0.0"))
     else:
         if (format < (1,5) or format > (1,8)):
@@ -671,7 +770,7 @@ def TemplateSubst(map, filename):
     templatefile = open_file(filename)
     template = templatefile.read()
     for x in map.keys():
-        template = template.replace(x,map[x])
+        template = template.replace(x, str(map[x]))
     templatefile.close()
     return template
 
@@ -691,6 +790,9 @@ def warn(msg):
 def whoami ():
     return pwd.getpwuid(os.getuid())[4].split(',')[0].replace('.', '')
 
+def getusername ():
+    return pwd.getpwuid(os.getuid())[0]
+
 ################################################################################
 
 def size_type (c):
@@ -875,8 +977,8 @@ def parse_args(Options):
         suite_ids_list = []
         for suitename in split_args(Options["Suite"]):
             suite = get_suite(suitename, session=session)
-            if suite_id is None:
-                warn("suite '%s' not recognised." % (suitename))
+            if suite.suite_id is None:
+                warn("suite '%s' not recognised." % (suite.suite_name))
             else:
                 suite_ids_list.append(suite.suite_id)
         if suite_ids_list: