From bb848767b4c8e322b6c27c5904ac8c0e28442e6c Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Tue, 27 Oct 2009 09:57:05 +0000 Subject: [PATCH] process-new: Fix BCC and X-Katie handling Signed-off-by: Frank Lichtenheld --- dak/process_new.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dak/process_new.py b/dak/process_new.py index 1efacb3f..7e8dd679 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -973,6 +973,14 @@ def do_pkg(changes_file, session): u = Upload() u.pkg.load_dot_dak(changes_file) u.update_subst() + + cnf = Config() + bcc = "X-DAK: dak process-new\nX-Katie: lisa $Revision: 1.31 $" + if cnf.has_key("Dinstall::Bcc"): + u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"]) + else: + u.Subst["__BCC__"] = bcc + files = u.pkg.files try: @@ -1110,11 +1118,6 @@ def main(): # Kill me now? **FIXME** cnf["Dinstall::Options::No-Mail"] = "" -# bcc = "X-DAK: dak process-new\nX-Katie: lisa $Revision: 1.31 $" -# if cnf.has_key("Dinstall::Bcc"): -# Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"]) -# else: -# Upload.Subst["__BCC__"] = bcc # commentsdir = cnf.get("Process-New::Options::Comments-Dir","") # if commentsdir: -- 2.39.5