X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_accepted.py;h=7f42d405753382ef7f7e6c51e43a5e7c50f56db5;hb=73d7a91a0d64633260a2ddd79a54f99e2d4f8ad1;hp=849cdfe91c88d56a0f773c77035d6361d2d365a8;hpb=f40df055fa0d4b37b6aac772e40747b8285c8c7c;p=dak.git diff --git a/dak/process_accepted.py b/dak/process_accepted.py index 849cdfe9..7f42d405 100755 --- a/dak/process_accepted.py +++ b/dak/process_accepted.py @@ -488,7 +488,7 @@ def stable_install (summary, short_summary): q = projectB.query(que) # Reduce the query results to a list of version numbers - ql = map(lambda x: x[0], q.getresult()) + ql = [ i[0] for i in q.getresult() ] if not ql: daklib.utils.fubar("[INTERNAL ERROR] couldn't find '%s' (%s for %s architecture) in binaries table." % (package, version, architecture)) else: @@ -538,7 +538,7 @@ def stable_install (summary, short_summary): if not Options["No-Mail"] and changes["architecture"].has_key("source"): Subst["__SUITE__"] = " into stable" Subst["__SUMMARY__"] = summary - mail_message = daklib.utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/process-accepted.installed") + mail_message = daklib.utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/process-accepted.install") daklib.utils.send_mail(mail_message) Upload.announce(short_summary, 1) @@ -614,7 +614,7 @@ def main(): Urgency_Logger = Urgency_Log(Cnf) # Initialize the substitution template mapping global - bcc = "X-DAK: dak process-accepted\nX-Katie: this header is obsolete" + bcc = "X-DAK: dak process-accepted\nX-Katie: $Revision: 1.18 $" if Cnf.has_key("Dinstall::Bcc"): Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) else: