[dak/master] Rename the one regex so it doesnt override the other
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
dak/add_user.py | 2 +-
daklib/regexes.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dak/add_user.py b/dak/add_user.py
index f658272..67e4769 100755
--- a/dak/add_user.py
+++ b/dak/add_user.py
@@ -136,7 +136,7 @@ def main():
% (utils.gpg_keyring_args(keyrings),
Cnf["Add-User::Options::Key"])
(result, output) = commands.getstatusoutput(cmd)
- m = re_gpg_fingerprint.search(output)
+ m = re_gpg_fingerprint_colon.search(output)
if not m:
print output
utils.fubar("0x%s: (1) No fingerprint found in gpg output but it returned 0?\n%s" \
diff --git a/daklib/regexes.py b/daklib/regexes.py
index 3d7d7a8..62b8ac2 100755
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -113,7 +113,7 @@ re_build_dep_arch = re.compile(r"\[[^]]+\]")
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);
+re_gpg_fingerprint_colon = 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);
--
1.5.6.5
Reply to: