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'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|xz)', ('debian_tar',)),
+ (r'orig\.tar\.(gz|bz2|xz)\.asc', ('orig_tar_sig',)),
(r'orig\.tar\.(gz|bz2|xz)', ('orig_tar',)),
(r'tar\.(gz|bz2|xz)', ('native_tar',)),
+ (r'orig-.+\.tar\.(gz|bz2|xz)\.asc', ('more_orig_tar_sig',)),
(r'orig-.+\.tar\.(gz|bz2|xz)', ('more_orig_tar',)),
)
# File does not match anything in lookup table; reject
if not matched:
- reject("%s: unexpected source file '%s'" % (dsc_filename, f))
+ rejmsg.append("%s: unexpected source file '%s'" % (dsc_filename, f))
+ break
# Check for multiple files
- for file_type in ('orig_tar', 'native_tar', 'debian_tar', 'debian_diff'):
+ for file_type in ('orig_tar', 'orig_tar_sig', 'native_tar', 'debian_tar', 'debian_diff'):
if has[file_type] > 1:
rejmsg.append("%s: lists multiple %s" % (dsc_filename, file_type))