From: Joerg Jaspert Date: Tue, 25 Nov 2008 21:40:52 +0000 (+0100) Subject: security X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ca7d643f6b998c6f8a1f5dac48e9e51e3cbc35db;p=dak.git security hopefully enable useful mails again Signed-off-by: Joerg Jaspert --- diff --git a/ChangeLog b/ChangeLog index d277537e..f83eb3e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-25 Joerg Jaspert + + * 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 * dak/process_unchecked.py (check_signed_by_key): remove the diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 167fd63a..0e6b852e 100755 --- 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 ():