From: Frank Lichtenheld Date: Tue, 27 Oct 2009 09:56:06 +0000 (+0000) Subject: Fix various small bugs X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7a09f0723e869eb8a7d0a36365e5562f2437f2d1;p=dak.git Fix various small bugs Signed-off-by: Frank Lichtenheld --- diff --git a/dak/process_new.py b/dak/process_new.py index b8e09c6a..1efacb3f 100755 --- 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 5d5f14c1..b1383be0 100755 --- 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 .reason file os.write(reason_fd, reject_mail_message)