Merge branch 'master' into bpo

[dak.git] / daklib / regexes.py

diff --git a/daklib/regexes.py b/daklib/regexes.py
old mode 100644 (file)
new mode 100755 (executable)
index 48b5281..ee26430
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -1,9 +1,15 @@
 #!/usr/bin/env python
 # vim:set et sw=4:
 
-"""Central repository of regexes for dak"""
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  James Troup <james@nocrew.org>
-# Copyright (C) 2009  Mark Hymers <mhy@debian.org>
+"""
+Central repository of regexes for dak
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2001, 2002, 2003, 2004, 2005, 2006  James Troup <james@nocrew.org>
+@copyright: 2009  Mark Hymers <mhy@debian.org>
+@copyright: 2009  Joerg Jaspert <joerg@debian.org>
+@license: GNU General Public License version 2 or later
+"""
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -92,3 +98,12 @@ re_build_dep_arch = re.compile(r"\[[^]]+\]")
 
 # From dak/transitions.py
 re_broken_package = re.compile(r"[a-zA-Z]\w+\s+\-.*")
+
+# From dak/add_user.py
+re_gpg_fingerprint = re.compile(r"^fpr:+(.*):$", re.MULTILINE);
+# The next one is dirty
+re_user_address = re.compile(r"^pub:.*<(.*)@.*>.*$", re.MULTILINE);
+re_user_mails = re.compile(r"^(pub|uid):[^rdin].*<(.*@.*)>.*$", re.MULTILINE);
+re_user_name = re.compile(r"^pub:.*:(.*)<.*$", re.MULTILINE);
+re_re_mark = re.compile(r'^RE:')
+