Merge remote-tracking branch 'drkranz/fixes'

* drkranz/fixes:
  queue-report: display a note for packages marked ACCEPT or REJECT
  Do not show absolute filenames in examine-packages
  Show correct actions while processing NEW queue

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

diff --git a/daklib/announce.py b/daklib/announce.py
index dec3e6029ac971a57e04be00b30d8c4f93509ee5..aa687323b8ca9e4bc3a90c0a84e3f96cdf576330 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()
@@ -148,7 +148,7 @@ def announce_accept(upload):
             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):