X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=daklib%2Fregexes.py;h=d46aaad381b490c06bd42993df6b670c66b22e86;hp=47e6ab2c9f255402d23878eccfb0be903abf1761;hb=557166746172f6e479aa83461a455d4eb9e9d8ee;hpb=77dc932880d95b604f1e4c7527403804fb7a833c diff --git a/daklib/regexes.py b/daklib/regexes.py index 47e6ab2c..d46aaad3 100755 --- a/daklib/regexes.py +++ b/daklib/regexes.py @@ -49,11 +49,11 @@ re_arch_from_filename = re.compile(r"/binary-[^/]+/") re_extract_src_version = re.compile (r"(\S+)\s*\((.*)\)") re_isadeb = re.compile (r"(.+?)_(.+?)_(.+)\.u?deb$") -orig_source_ext_re = r"orig(?:-.+)?\.tar\.(?:gz|bz2)" +orig_source_ext_re = r"orig(?:-.+)?\.tar\.(?:gz|bz2|xz)" re_orig_source_ext = re.compile(orig_source_ext_re + "$") -re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2)|diff\.gz|tar\.(?:gz|bz2)|dsc)$") +re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2|xz)|diff\.gz|tar\.(?:gz|bz2|xz)|dsc)$") re_issource = re.compile(r"(.+)_(.+?)\." + re_source_ext.pattern) -re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2)$") +re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2|xz)$") #re_is_orig_source = re.compile (r"(.+)_(.+?)\.(?:orig\.)?tar\.(?:gz|bz2)$") re_single_line_field = re.compile(r"^(\S*?)\s*:\s*(.*)")