security

hopefully enable useful mails again

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/ChangeLog b/ChangeLog
index d277537e61b2534e9c7e242c8f2537be5847f8c2..f83eb3e7ae67976b8b20a076bee5e29f010307ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-25  Joerg Jaspert  <joerg@debian.org>
+
+       * dak/process_unchecked.py (queue_(un)embargo): (Hopefully) enable
+       sending mails again, which got broken when testing-security
+       handling was (not completly correctly) implemented. Closes: #440004
+
 2008-11-24  Joerg Jaspert  <joerg@debian.org>
 
        * dak/process_unchecked.py (check_signed_by_key): remove the

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 167fd63a8cb910cd39d1e3fac60754a50250b80e..0e6b852e6aaac8830b34829564d24e5ca7169b57 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -1246,6 +1246,14 @@ def queue_unembargo (summary, short_summary):
     Upload.Subst["__SUMMARY__"] = summary
     Upload.check_override()
 
+    # Send accept mail, announce to lists, close bugs and check for
+    # override disparities
+    if not Cnf["Dinstall::Options::No-Mail"]:
+        Upload.Subst["__SUITE__"] = ""
+        mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-unchecked.accepted")
+        utils.send_mail(mail_message)
+        Upload.announce(short_summary, 1)
+
 ################################################################################
 
 def is_embargo ():
@@ -1264,6 +1272,14 @@ def queue_embargo (summary, short_summary):
     Upload.Subst["__SUMMARY__"] = summary
     Upload.check_override()
 
+    # Send accept mail, announce to lists, close bugs and check for
+    # override disparities
+    if not Cnf["Dinstall::Options::No-Mail"]:
+        Upload.Subst["__SUITE__"] = ""
+        mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-unchecked.accepted")
+        utils.send_mail(mail_message)
+        Upload.announce(short_summary, 1)
+
 ################################################################################
 
 def is_stableupdate ():