From: Julien Cristau Date: Fri, 20 May 2016 06:31:03 +0000 (+0200) Subject: Move more specific source file regexes before general ones, again X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=ac7962e07a871d2619b475c54f6be2b3a79616ee;ds=sidebyside Move more specific source file regexes before general ones, again Otherwise foo.orig.tar.gz.asc matches orig_tar before it has a change to be matched against orig_tar_sig. Signed-off-by: Julien Cristau --- diff --git a/daklib/utils.py b/daklib/utils.py index 6e7fc069..5e9c9b94 100644 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -307,11 +307,11 @@ def check_dsc_files(dsc_filename, dsc, dsc_files): has = defaultdict(lambda: 0) ftype_lookup = ( + (r'orig\.tar\.(gz|bz2|xz)\.asc', ('orig_tar_sig',)), (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',)),