From: Joerg Jaspert Date: Thu, 16 Aug 2012 19:06:13 +0000 (+0200) Subject: Merge remote-tracking branch 'drkranz/fixes' X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9e40c7aa193ec9a3e4041369298167c9d0402fdf;hp=074aa99a09ef60771b3fb438f8ae05cad291c137;p=dak.git 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 --- diff --git a/daklib/announce.py b/daklib/announce.py index dec3e602..aa687323 100644 --- 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):