X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=f01f4b91b1278e6549963da4c2fb1359aa2289a6;hb=25a56c7669cfdd660472b1bbc6a674113f3346ef;hp=d73ca3565b1c48303424513e924ad8e161fb1aa8;hpb=eb7609bc253b856d1463610e4daa4f4c7aec7e90;p=dak.git

diff --git a/dak/process_new.py b/dak/process_new.py
index d73ca356..f01f4b91 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -531,18 +531,18 @@ def check_pkg (upload):
 
 ## FIXME: horribly Debian specific
 
-# def do_bxa_notification():
-#     files = Upload.pkg.files
-#     summary = ""
-#     for f in files.keys():
-#         if files[f]["type"] == "deb":
-#             control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(f)))
-#             summary += "\n"
-#             summary += "Package: %s\n" % (control.Find("Package"))
-#             summary += "Description: %s\n" % (control.Find("Description"))
-#     Upload.Subst["__BINARY_DESCRIPTIONS__"] = summary
-#     bxa_mail = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-new.bxa_notification")
-#     utils.send_mail(bxa_mail)
+def do_bxa_notification(upload):
+    files = upload.pkg.files
+    summary = ""
+    for f in files.keys():
+        if files[f]["type"] == "deb":
+            control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(f)))
+            summary += "\n"
+            summary += "Package: %s\n" % (control.Find("Package"))
+            summary += "Description: %s\n" % (control.Find("Description"))
+    upload.Subst["__BINARY_DESCRIPTIONS__"] = summary
+    bxa_mail = utils.TemplateSubst(upload.Subst,Config()["Dir::Templates"]+"/process-new.bxa_notification")
+    utils.send_mail(bxa_mail)
 
 ################################################################################
 
@@ -560,7 +560,7 @@ def add_overrides (new, upload, session):
             section_id = new[pkg]["section id"]
             Logger.log(["%s overrides" % (srcpkg), suite, new[pkg]["component"], new[pkg]["type"], new[pkg]["priority"], new[pkg]["section"]])
             session.execute("INSERT INTO override (suite, component, type, package, priority, section, maintainer) VALUES (:sid, :cid, :tid, :pkg, :pid, :sectid, '')",
-                            { 'sid': suite.suiteid, 'cid': component_id, 'tid':type_id, 'pkg': pkg, 'pid': priority_id, 'sectid': section_id})
+                            { 'sid': suite_id, 'cid': component_id, 'tid':type_id, 'pkg': pkg, 'pid': priority_id, 'sectid': section_id})
             for f in new[pkg]["files"]:
                 if files[f].has_key("new"):
                     del files[f]["new"]
@@ -568,8 +568,8 @@ def add_overrides (new, upload, session):
 
     session.commit()
 
-#     if Cnf.FindB("Dinstall::BXANotify"):
-#         do_bxa_notification()
+    if Config().FindB("Dinstall::BXANotify"):
+        do_bxa_notification(upload)
 
 ################################################################################
 
@@ -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:
@@ -1073,7 +1081,7 @@ def main():
 
     cnf = Config()
     session = DBConn().session()
-    
+
     Arguments = [('a',"automatic","Process-New::Options::Automatic"),
                  ('h',"help","Process-New::Options::Help"),
                  ('C',"comments-dir","Process-New::Options::Comments-Dir", "HasArg"),
@@ -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: