提交 7a09f072 编写于 作者: F Frank Lichtenheld

Fix various small bugs

Signed-off-by: NFrank Lichtenheld <djpig@debian.org>
上级 d9d78d45
...@@ -531,7 +531,7 @@ def check_pkg (upload): ...@@ -531,7 +531,7 @@ def check_pkg (upload):
## FIXME: horribly Debian specific ## FIXME: horribly Debian specific
def do_bxa_notification(): def do_bxa_notification(upload):
files = upload.pkg.files files = upload.pkg.files
summary = "" summary = ""
for f in files.keys(): for f in files.keys():
...@@ -560,7 +560,7 @@ def add_overrides (new, upload, session): ...@@ -560,7 +560,7 @@ def add_overrides (new, upload, session):
section_id = new[pkg]["section id"] section_id = new[pkg]["section id"]
Logger.log(["%s overrides" % (srcpkg), suite, new[pkg]["component"], new[pkg]["type"], new[pkg]["priority"], new[pkg]["section"]]) 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, '')", 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"]: for f in new[pkg]["files"]:
if files[f].has_key("new"): if files[f].has_key("new"):
del files[f]["new"] del files[f]["new"]
......
...@@ -1849,7 +1849,7 @@ distribution.""" ...@@ -1849,7 +1849,7 @@ distribution."""
user_email_address = utils.whoami() + " <%s>" % (cnf["Dinstall::MyAdminAddress"]) user_email_address = utils.whoami() + " <%s>" % (cnf["Dinstall::MyAdminAddress"])
self.Subst["__REJECTOR_ADDRESS__"] = user_email_address self.Subst["__REJECTOR_ADDRESS__"] = user_email_address
self.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message 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) reject_mail_message = utils.TemplateSubst(self.Subst, rej_template)
# Write the rejection email out as the <foo>.reason file # Write the rejection email out as the <foo>.reason file
os.write(reason_fd, reject_mail_message) os.write(reason_fd, reject_mail_message)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册