This is SQL, not Python.

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index b8e09c6a5f73832875b56c4a7918a75fd5bd79d5..f01f4b91b1278e6549963da4c2fb1359aa2289a6 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -531,7 +531,7 @@ def check_pkg (upload):
 
 ## FIXME: horribly Debian specific
 
-def do_bxa_notification():
+def do_bxa_notification(upload):
     files = upload.pkg.files
     summary = ""
     for f in files.keys():
@@ -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"]
@@ -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: