Merge remote-tracking branch 'ansgar/pu/multiarchive-2'

* ansgar/pu/multiarchive-2:
  dak/process_upload.py: set __ANNOUNCE_LIST_ADDRESS__ subst variable

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

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 28a60a931073a2e83c8abd3ab79cf1c2434c0f25..8b9a178aa9e0a417ff2c2bbd66ada85c92c706bd 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -309,12 +309,16 @@ def accept(directory, upload):
             continue
         announce.update(suite.announce or [])
     announce_address = ", ".join(announce)
+    subst['__ANNOUNCE_LIST_ADDRESS__'] = announce_address
+
     tracking = cnf.get('Dinstall::TrackingServer')
     if tracking and 'source' in upload.changes.architectures:
         announce_address = '{0}\nBcc: {1}@{2}'.format(announce_address, control['Source'], tracking)
     message = utils.TemplateSubst(subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.announce'))
     utils.send_mail(message)
 
+    del subst['__ANNOUNCE_LIST_ADDRESS__']
+
     # Only close bugs for uploads that were not redirected to a policy queue.
     # process-policy will close bugs for those once they are accepted.
     subst = subst_for_upload(upload)