X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=00896243e025152bde31f8faeed3b98d4aac061c;hb=28f3e6f0659504214d482d682f4b2b4791872cc6;hp=6fd0c81d0955ae4bbe8dc3f94aa9aab815891675;hpb=05e76c8434279daed67dc1020fe7dc5799800616;p=dak.git

diff --git a/daklib/regexes.py b/daklib/regexes.py
index 6fd0c81d..00896243 100755
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -42,9 +42,13 @@ re_arch_from_filename = re.compile(r"/binary-[^/]+/")
 re_extract_src_version = re.compile (r"(\S+)\s*\((.*)\)")
 re_isadeb = re.compile (r"(.+?)_(.+?)_(.+)\.u?deb$")
 
-re_issource = re.compile (r"(.+)_(.+?)\.(orig\.tar\.gz|diff\.gz|tar\.gz|dsc)$")
+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)|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)$")
 
-re_single_line_field = re.compile(r"^(\S*)\s*:\s*(.*)")
+re_single_line_field = re.compile(r"^(\S*?)\s*:\s*(.*)")
 re_multi_line_field = re.compile(r"^\s(.*)")
 re_taint_free = re.compile(r"^[-+~/\.\w]+$")