daklib/config.py: add find_i method

[dak.git] / daklib / regexes.py

diff --git a/daklib/regexes.py b/daklib/regexes.py
index 202aa57005045ac86d10073d02013d75505b1796..a8107113ecd54257ec7a72f922fe8828d8e6f7a5 100755 (executable)
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -145,7 +145,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
@@ -180,4 +180,4 @@ re_field_version_upstream = re.compile(r'^(?:[0-9]+:)?(?P<upstream>.*)-[^-]*$')
 
 # Match source field
 # Groups: package, version
-re_field_source = re.compile(r'^(?P<package>[a-z0-9][a-z0-9.+-]+)(:?\s*\((?P<version>[A-Za-z0-9.:~+-])\))?')
+re_field_source = re.compile(r'^(?P<package>[a-z0-9][a-z0-9.+-]+)(?:\s*\((?P<version>[A-Za-z0-9.:~+-]+)\))?$')