Rename the one regex so it doesnt override the other

[dak.git] / dak / add_user.py

diff --git a/dak/add_user.py b/dak/add_user.py
index f6fb645ff5d464dd2a04998b2972e0004e50c965..67e4769447a34a09915387408dd1b5a65a455f7c 100755 (executable)
--- a/dak/add_user.py
+++ b/dak/add_user.py
@@ -22,7 +22,7 @@ import sys
 import apt_pkg
 
 from daklib import utils
-from daklib.dbconn import DBConn, add_database_user, get_or_set_uid
+from daklib.dbconn import DBConn, get_or_set_uid
 from daklib.regexes import re_gpg_fingerprint, re_user_address, re_user_mails, re_user_name
 
 ################################################################################
@@ -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" \
@@ -198,7 +198,6 @@ def main():
         # Note that we provide a session, so we're responsible for committing
         uidobj = get_or_set_uid(uid, session=session)
         uid_id = uidobj.uid_id
-        add_database_user(uid)
         session.commit()
 
         # The following two are kicked out in rhona, so we don't set them. kelly adds
@@ -211,10 +210,10 @@ def main():
 
         # Lets add user to the email-whitelist file if its configured.
         if Cnf.has_key("Dinstall::MailWhiteList") and Cnf["Dinstall::MailWhiteList"] != "":
-            file = utils.open_file(Cnf["Dinstall::MailWhiteList"], "a")
+            f = utils.open_file(Cnf["Dinstall::MailWhiteList"], "a")
             for mail in emails:
-                file.write(mail+'\n')
-            file.close()
+                f.write(mail+'\n')
+            f.close()
 
         print "Added:\nUid:\t %s (ID: %s)\nMaint:\t %s\nFP:\t %s" % (uid, uid_id, \
                      name, primary_key)