Add by-hash support

[dak.git] / daklib / announce.py

diff --git a/daklib/announce.py b/daklib/announce.py
index fdc3e468555a4782adc22c586dd75f0e1a3ebaf6..e784df03619d05a7346728cd255fee4f7f17498d 100644 (file)
--- a/daklib/announce.py
+++ b/daklib/announce.py
@@ -47,6 +47,8 @@ class ProcessedUpload(object):
     # program
     program = "unknown-program"
 
+    warnings = []
+
 def _subst_for_upload(upload):
     cnf = Config()
 
@@ -79,6 +81,7 @@ def _subst_for_upload(upload):
         '__SOURCE__': upload.source,
         '__VERSION__': upload.version,
         '__ARCHITECTURE__': upload.architecture,
+        '__WARNINGS__': '\n'.join(upload.warnings),
         }
 
     override_maintainer = cnf.get('Dinstall::OverrideMaintainer')
@@ -104,7 +107,7 @@ def announce_reject(upload, reason, rejected_by=None):
         subst['__REJECTOR_ADDRESS__'] = rejected_by
 
     if not automatic:
-        subst['__BCC__'] = '{0}\nBcc: {1}'.format(subst['__BCC__'], cnf['Dinstall::MyEmailAddress'])
+        subst['__BCC__'] = '{0}\nBcc: {1}'.format(subst['__BCC__'], subst['__REJECTOR_ADDRESS__'])
 
     message = TemplateSubst(subst, os.path.join(cnf['Dir::Templates'], 'queue.rejected'))
     send_mail(message, whitelists=whitelists)