X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=ad57ce5f8030be228cb7efe96ff88e5e6ac32de0;hb=2b27c94e1c4d59f54fbec176a91631c09cea4988;hp=a8107113ecd54257ec7a72f922fe8828d8e6f7a5;hpb=56c670d4b1dd0d73a38f9e6d47d48356b8cc3407;p=dak.git

diff --git a/daklib/regexes.py b/daklib/regexes.py
old mode 100755
new mode 100644
index a8107113..ad57ce5f
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -90,10 +90,6 @@ re_spacestrip = re.compile('(\s)')
 # From import_archive.py
 re_arch_from_filename = re.compile(r"binary-[^/]+")
 
-# From import_ldap_fingerprints.py
-re_gpg_fingerprint = re.compile(r"^\s+Key fingerprint = (.*)$", re.MULTILINE)
-re_debian_address = re.compile(r"^.*<(.*)@debian\.org>$", re.MULTILINE)
-
 # From new_security_install.py
 re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$")
 
@@ -127,7 +123,7 @@ 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)$")
+re_includeinrelease = re.compile (r"(Translation-[a-zA-Z_]+\.(?:bz2|xz)|Contents-[0-9a-z-]+.gz|Index|Packages(.gz|.bz2|.xz)?|Sources(.gz|.bz2|.xz)?|MD5SUMS|SHA256SUMS|Release)$")
 
 # in generate_index_diffs
 re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))")