X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=8c9a7fae72545e9159973c60a2962c9c08c8b8d3;hb=dd80b169287a128cd9e3b833852fbf68106385b5;hp=3d7d7a8bf534031781ef697776784502db9fbe98;hpb=64e27826913d0bdf1700a9e025773899e12f3500;p=dak.git

diff --git a/daklib/regexes.py b/daklib/regexes.py
index 3d7d7a8b..8c9a7fae 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*(.*)")
@@ -113,7 +113,7 @@ re_build_dep_arch = re.compile(r"\[[^]]+\]")
 re_broken_package = re.compile(r"[a-zA-Z]\w+\s+\-.*")
 
 # From dak/add_user.py
-re_gpg_fingerprint = re.compile(r"^fpr:+(.*):$", re.MULTILINE);
+re_gpg_fingerprint_colon = re.compile(r"^fpr:+(.*):$", re.MULTILINE);
 # The next one is dirty
 re_user_address = re.compile(r"^pub:.*<(.*)@.*>.*$", re.MULTILINE);
 re_user_mails = re.compile(r"^(pub|uid):[^rdin].*<(.*@.*)>.*$", re.MULTILINE);
@@ -124,3 +124,10 @@ re_parse_lintian = re.compile(r"^(?P<level>W|E|O): (?P<package>.*?): (?P<tag>[^
 
 # in process-upload
 re_match_expired = re.compile(r"^The key used to sign .+ has expired on .+$")
+
+# in generate-releases
+re_gensubrelease = re.compile (r".*/(binary-[0-9a-z-]+|source)$")
+re_includeinrelease = re.compile (r"(Translation-[a-zA-Z_]+\.(?:bz2|xz)|Contents-[0-9a-z-]+.gz|Index|Packages(.gz|.bz2)?|Sources(.gz|.bz2)?|MD5SUMS|SHA256SUMS|Release)$")
+
+# in generate_index_diffs
+re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))")