X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fadd_user.py;h=77de3e3fb617290c769a2752d0e5db66b2e7234d;hb=473d5f7657d185319a111717f4203bc4dd6defe3;hp=0e69b7a7625b714a1e19967bdb1749fb465a4599;hpb=8ddcf2fc24b1a0542ed38a25cab7316029a46147;p=dak.git diff --git a/dak/add_user.py b/dak/add_user.py index 0e69b7a7..77de3e3f 100755 --- a/dak/add_user.py +++ b/dak/add_user.py @@ -18,15 +18,9 @@ add his key to the GPGKeyring # I know what I say. I dont know python and I wrote it. So go and read some other stuff. import commands -import pg -import re import sys -import time -import os import apt_pkg -from daklib import daklog -from daklib import queue from daklib import utils from daklib.dbconn import DBConn, add_database_user, get_or_set_uid from daklib.regexes import re_gpg_fingerprint, re_user_address, re_user_mails, re_user_name @@ -35,8 +29,6 @@ from daklib.regexes import re_gpg_fingerprint, re_user_address, re_user_mails, r Cnf = None Logger = None -Upload = None -Subst = None ################################################################################ @@ -229,8 +221,7 @@ def main(): # Should we send mail to the newly added user? if Cnf.FindB("Add-User::SendEmail"): mail = name + "<" + emails[0] +">" - Upload = queue.Upload(Cnf) - Subst = Upload.Subst + Subst = {} Subst["__NEW_MAINTAINER__"] = mail Subst["__UID__"] = uid Subst["__KEYID__"] = Cnf["Add-User::Options::Key"]