X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=95cf35231b1f26c3fa425c7c134df453ec84cf43;hb=70a6b787b2216603e788dc00c49aed63d5b20ad8;hp=b734e9fa93ff81ce875e9db64845b19e3971e90f;hpb=c603d6416b8850a4bb6f8778d13e168a445b07d2;p=dak.git

diff --git a/daklib/regexes.py b/daklib/regexes.py
old mode 100755
new mode 100644
index b734e9fa..95cf3523
--- 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]+$")
 
@@ -145,7 +141,7 @@ _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
-re_file_binary = re.compile(_re_file_prefix + r'_(?P<architecture>[a-z0-9]+)\.(?P<type>u?deb)$')
+re_file_binary = re.compile(_re_file_prefix + r'_(?P<architecture>[a-z0-9-]+)\.(?P<type>u?deb)$')
 
 # Match changes files
 # Groups: package, version, suffix