Fix various small bugs

Signed-off-by: Frank Lichtenheld <djpig@debian.org>

diff --git a/dak/process_new.py b/dak/process_new.py
index b8e09c6a5f73832875b56c4a7918a75fd5bd79d5..1efacb3f5376f016d0859f38a7eee8555caabed9 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"]

diff --git a/daklib/queue.py b/daklib/queue.py
index 5d5f14c1bbc7f2ddc65e12c039f42b1cec5a667f..b1383be035c829a568a66ab71523b24dd38378bc 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1849,7 +1849,7 @@ distribution."""
             user_email_address = utils.whoami() + " <%s>" % (cnf["Dinstall::MyAdminAddress"])
             self.Subst["__REJECTOR_ADDRESS__"] = user_email_address
             self.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message
-            self.Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"]
+            self.Subst["__CC__"] = "Cc: " + cnf["Dinstall::MyEmailAddress"]
             reject_mail_message = utils.TemplateSubst(self.Subst, rej_template)
             # Write the rejection email out as the <foo>.reason file
             os.write(reason_fd, reject_mail_message)