Merge branch 'master' into security

[dak.git] / dak / reject_proposed_updates.py

diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py
old mode 100644 (file)
new mode 100755 (executable)
index 060ad51..a61db17
--- a/dak/reject_proposed_updates.py
+++ b/dak/reject_proposed_updates.py
@@ -21,10 +21,10 @@
 
 import os, pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
 
 ################################################################################
 
@@ -168,6 +168,7 @@ def reject (reject_message = ""):
     Upload.Subst["__REJECTOR_ADDRESS__"] = user_email_address
     Upload.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message
     Upload.Subst["__STABLE_REJECTOR__"] = Cnf["Reject-Proposed-Updates::StableRejector"]
+    Upload.Subst["__STABLE_MAIL__"] = Cnf["Reject-Proposed-Updates::StableMail"]
     Upload.Subst["__MORE_INFO_URL__"] = Cnf["Reject-Proposed-Updates::MoreInfoURL"]
     Upload.Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"]
     reject_mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/reject-proposed-updates.rejected")