X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=06cb173604689b3d1b42d2ac7180f80b56c49ffa;hb=f5255d39ec6915a97fdccfc536479d579b5f19a3;hp=a8107113ecd54257ec7a72f922fe8828d8e6f7a5;hpb=5ae0dac7c89af97eab8ba4fb34e1099a3b9dddc7;p=dak.git diff --git a/daklib/regexes.py b/daklib/regexes.py index a8107113..06cb1736 100644 --- a/daklib/regexes.py +++ b/daklib/regexes.py @@ -61,7 +61,6 @@ re_multi_line_field = re.compile(r"^\s(.*)") re_taint_free = re.compile(r"^[-+~/\.\w]+$") re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\>]+)\>") -re_gpg_uid = re.compile('^uid.*<([^>]*)>') re_srchasver = re.compile(r"^(\S+)\s+\((\S+)\)$") re_verwithext = re.compile(r"^(\d+)(?:\.(\d+))(?:\s+\((\S+)\))?$") @@ -90,10 +89,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 +122,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))")