re_re_mark, re_whitespace_comment, re_issource
from srcformats import srcformats
+from collections import defaultdict
################################################################################
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)
+
for f in dsc_files.keys():
m = re_issource.match(f)
if not m:
continue
ftype = m.group(3)
if ftype == "orig.tar.gz":
- has_orig_tar_gz += 1
- has_orig_tar += 1
+ has['orig_tar_gz'] += 1
+ has['orig_tar'] += 1
elif ftype == "diff.gz":
- has_debian_diff += 1
+ has['debian_diff'] += 1
elif ftype == "tar.gz":
- has_native_tar_gz += 1
- has_native_tar += 1
+ has['native_tar_gz'] += 1
+ has['native_tar'] += 1
elif re.match(r"debian\.tar\.(gz|bz2|lzma)", ftype):
- has_debian_tar += 1
+ has['debian_tar'] += 1
elif re.match(r"orig\.tar\.(gz|bz2|lzma)", ftype):
- has_orig_tar += 1
+ has['orig_tar'] += 1
elif re.match(r"tar\.(gz|bz2|lzma)", ftype):
- has_native_tar += 1
+ has['native_tar'] += 1
elif re.match(r"orig-.+\.tar\.(gz|bz2|lzma)", ftype):
- has_more_orig_tar += 1
+ has['more_orig_tar'] += 1
else:
reject("%s: unexpected source file '%s'" % (dsc_filename, f))
- if has_orig_tar > 1:
+ if has['orig_tar'] > 1:
rejmsg.append("%s: lists multiple .orig tarballs." % (dsc_filename))
- if has_native_tar > 1:
+ if has['native_tar'] > 1:
rejmsg.append("%s: lists multiple native tarballs." % (dsc_filename))
- if has_debian_tar > 1 or has_debian_diff > 1:
+ if has['debian_tar'] > 1 or has['debian_diff'] > 1:
rejmsg.append("%s: lists multiple debian diff/tarballs." % (dsc_filename))
for format in srcformats:
if format.re_format.match(dsc['format']):
- rejmsg.extend(format.reject_msgs(
- dsc_filename,
- has_native_tar,
- has_native_tar_gz,
- has_debian_tar,
- has_debian_diff,
- has_orig_tar,
- has_orig_tar_gz,
- has_more_orig_tar
- ))
+ rejmsg.extend([
+ '%s: %s' % (dsc_filename, x) for x in format.reject_msgs(has)
+ ])
break
return rejmsg