X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fadd_user.py;h=8da9dcdf3b6c5971ad8615a9a8e03666457003ad;hb=782339bc8e1a2e17b9e6b3009b22b5efa74218f7;hp=0e69b7a7625b714a1e19967bdb1749fb465a4599;hpb=8ddcf2fc24b1a0542ed38a25cab7316029a46147;p=dak.git diff --git a/dak/add_user.py b/dak/add_user.py index 0e69b7a7..8da9dcdf 100755 --- a/dak/add_user.py +++ b/dak/add_user.py @@ -18,7 +18,6 @@ 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 @@ -26,7 +25,6 @@ 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 +33,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 +225,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"]