X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=00896243e025152bde31f8faeed3b98d4aac061c;hb=28f3e6f0659504214d482d682f4b2b4791872cc6;hp=f18e2a49da6394b3facbc3561fa574c62ebd3566;hpb=c1a20d66f13f41952f742d7cc555b2a7d9004cd4;p=dak.git diff --git a/daklib/regexes.py b/daklib/regexes.py index f18e2a49..00896243 100755 --- a/daklib/regexes.py +++ b/daklib/regexes.py @@ -42,11 +42,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|lzma)" +orig_source_ext_re = r"orig(?:-.+)?\.tar\.(?:gz|bz2)" re_orig_source_ext = re.compile(orig_source_ext_re + "$") -re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2|lzma)|diff\.gz|tar\.(?:gz|bz2|lzma)|dsc)$") +re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2)|diff\.gz|tar\.(?:gz|bz2)|dsc)$") re_issource = re.compile(r"(.+)_(.+?)\." + re_source_ext.pattern) -re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2|lzma)$") +re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2)$") re_single_line_field = re.compile(r"^(\S*?)\s*:\s*(.*)") re_multi_line_field = re.compile(r"^\s(.*)")