From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 12 Aug 2012 13:27:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'ansgar/pu/multiarchive-2'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=039b87c9a0d68c3acd4cd893396334d6f3ea06a0;hp=4d1d8a37a622bb55c1a491e1294f05de06b707c9;p=dak.git

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

* ansgar/pu/multiarchive-2:
  dak/process_upload.py: add missing "not"; set subst variable at the right time

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

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 8b9a178a..74229e2f 100755
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -305,15 +305,17 @@ def accept(directory, upload):
     subst = subst_for_upload(upload)
     announce = set()
     for suite in upload.final_suites:
-        if suite.policy_queue is None:
+        if suite.policy_queue is not None:
             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)
+
+    subst['__ANNOUNCE_LIST_ADDRESS__'] = announce_address
+
     message = utils.TemplateSubst(subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.announce'))
     utils.send_mail(message)