X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=6e00164ce1590051d41f157d20a4e864e8204428;hb=fdbef587c29814f97c192de5a8b7e9f09cc45fa4;hp=ad57ce5f8030be228cb7efe96ff88e5e6ac32de0;hpb=ba179a1f739af0852cad9b30c5fefae190f96383;p=dak.git diff --git a/daklib/regexes.py b/daklib/regexes.py index ad57ce5f..6e00164c 100644 --- a/daklib/regexes.py +++ b/daklib/regexes.py @@ -34,8 +34,6 @@ re_isanum = re.compile (r"^\d+$") #: Looking for the default reply re_default_answer = re.compile(r"\[(.*)\]") -#: Used in build_summaries to make changes output look better -re_fdnic = re.compile(r"\n\n") #: Detect a binnmu re_bin_only_nmu = re.compile(r"\+b\d+$") @@ -61,7 +59,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+)\))?$") @@ -134,10 +131,10 @@ re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))") ###################################################################### # Match safe filenames -re_file_safe = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_.:~+-]*$') +re_file_safe = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_.~+-]*$') # Prefix of binary and source filenames -_re_file_prefix = r'^(?P[a-z0-9][a-z0-9.+-]+)_(?P[A-Za-z0-9.:~+-]+?)' +_re_file_prefix = r'^(?P[a-z0-9][a-z0-9.+-]+)_(?P[A-Za-z0-9.~+-]+?)' # Match binary packages # Groups: package, version, architecture, type