X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=dd1c3dd8475da393e8188dd0490e368ae57bb4d2;hb=9dbb7b6ec34adb6a28180279895c888806f6e9de;hp=ad57ce5f8030be228cb7efe96ff88e5e6ac32de0;hpb=ba179a1f739af0852cad9b30c5fefae190f96383;p=dak.git

diff --git a/daklib/regexes.py b/daklib/regexes.py
index ad57ce5f..dd1c3dd8 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+)\))?$")
@@ -134,10 +133,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<package>[a-z0-9][a-z0-9.+-]+)_(?P<version>[A-Za-z0-9.:~+-]+?)'
+_re_file_prefix = r'^(?P<package>[a-z0-9][a-z0-9.+-]+)_(?P<version>[A-Za-z0-9.~+-]+?)'
 
 # Match binary packages
 # Groups: package, version, architecture, type