X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_policy.py;h=5992cdd558b15853f02299d1fc677833382e9b6a;hb=07ad10059f7d5c840d1e1a26b28e518408435110;hp=695751c457de1e2bf46684fb6381fb866ca22b48;hpb=4c6211d2717aab314dbb588cf37a5d998a1a3d85;p=dak.git

diff --git a/dak/process_policy.py b/dak/process_policy.py
index 695751c4..5992cdd5 100755
--- a/dak/process_policy.py
+++ b/dak/process_policy.py
@@ -156,14 +156,15 @@ def comment_accept(upload, srcqueue, comments, transaction):
         Logger.log(["Policy Queue ACCEPT", srcqueue.queue_name, changesname])
 
     # Send announcement
-    subst = subst_for_upload(upload)
-    announce = ", ".join(upload.target_suite.announce or [])
-    tracking = cnf.get('Dinstall::TrackingServer')
-    if tracking and upload.source is not None:
-        announce = '{0}\nBcc: {1}@{2}'.format(announce, upload.changes.source, tracking)
-    subst['__ANNOUNCE_LIST_ADDRESS__'] = announce
-    message = utils.TemplateSubst(subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.announce'))
-    utils.send_mail(message)
+    if upload.source is not None:
+        subst = subst_for_upload(upload)
+        announce = ", ".join(upload.target_suite.announce or [])
+        tracking = cnf.get('Dinstall::TrackingServer')
+        if tracking and upload.source is not None:
+            announce = '{0}\nBcc: {1}@{2}'.format(announce, upload.changes.source, tracking)
+        subst['__ANNOUNCE_LIST_ADDRESS__'] = announce
+        message = utils.TemplateSubst(subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.announce'))
+        utils.send_mail(message)
 
     # TODO: code duplication. Similar code is in process-upload.
     if cnf.find_b('Dinstall::CloseBugs') and upload.changes.closes is not None and upload.source is not None:
@@ -278,7 +279,10 @@ def subst_for_upload(upload):
     cnf = Config()
 
     maintainer_field = upload.changes.changedby or upload.changes.maintainer
-    addresses = utils.mail_addresses_for_upload(upload.changes.maintainer, maintainer_field, upload.changes.fingerprint)
+    if upload.source is not None:
+        addresses = utils.mail_addresses_for_upload(upload.changes.maintainer, maintainer_field, upload.changes.fingerprint)
+    else:
+        addresses = utils.mail_addresses_for_upload(upload.changes.maintainer, upload.changes.maintainer, upload.changes.fingerprint)
 
     changes_path = os.path.join(upload.policy_queue.path, upload.changes.changesname)
     changes_contents = open(changes_path, 'r').read()