Merge branch 'dak-unpriv' into merge

[dak.git] / daklib / announce.py

diff --git a/daklib/announce.py b/daklib/announce.py
index dec3e6029ac971a57e04be00b30d8c4f93509ee5..6c0fd374186aed603dfc74e7ebeab90a6e034acb 100644 (file)
--- a/daklib/announce.py
+++ b/daklib/announce.py
@@ -134,7 +134,7 @@ def announce_accept(upload):
 
         tracking = cnf.get('Dinstall::TrackingServer')
         if tracking:
-            announce_list_address = "{0}\n{1}@{2}".format(announce_list_address, upload.source, tracking)
+            announce_list_address = "{0}\nBcc: {1}@{2}".format(announce_list_address, upload.source, tracking)
 
         if len(announce_list_address) != 0:
             my_subst = subst.copy()
@@ -143,12 +143,14 @@ def announce_accept(upload):
             message = TemplateSubst(my_subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.announce'))
             send_mail(message)
 
-    if accepted_to_real_suite and upload.sourceful and cnf.find_b('Dinstall::CloseBugs'):
+    close_bugs_default = cnf.find_b('Dinstall::CloseBugs')
+    close_bugs = any(s.close_bugs if s.close_bugs is not None else close_bugs_default for s in upload.suites)
+    if accepted_to_real_suite and upload.sourceful and close_bugs:
         for bug in upload.bugs:
             my_subst = subst.copy()
             my_subst['__BUG_NUMBER__'] = str(bug)
 
-            message = TemplateSubst(subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.bug-close'))
+            message = TemplateSubst(my_subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.bug-close'))
             send_mail(message)
 
 def announce_new(upload):