[dak/master 7/7] process-new: Fix BCC and X-Katie handling

[Frank Lichtenheld <djpig@debian.org>]

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
---
 dak/process_new.py |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dak/process_new.py b/dak/process_new.py
index 1efacb3..7e8dd67 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:
-- 
1.6.3.3