diff options
| author | Milo Casagrande <milo.casagrande@linaro.org> | 2015-03-31 11:06:15 +0200 |
|---|---|---|
| committer | Milo Casagrande <milo.casagrande@linaro.org> | 2015-03-31 11:06:15 +0200 |
| commit | 21c0f93580c50f148d368148d1b57710065698d2 (patch) | |
| tree | a7e9e22389c529ba48e79fc8961d2c1b67512c27 | |
| parent | a6812611ba7bc1142b1014686c5ba5e47ee1556b (diff) | |
Move variable definitions.
| -rw-r--r-- | app/utils/report/boot.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/utils/report/boot.py b/app/utils/report/boot.py index ce9988d..9ef13d0 100644 --- a/app/utils/report/boot.py +++ b/app/utils/report/boot.py @@ -479,11 +479,6 @@ def _create_boot_email(**kwargs): boot_summary_url = u"%(boot_url)s/%(job)s/kernel/%(kernel)s/" % kwargs build_summary_url = u"%(build_url)s/%(job)s/kernel/%(kernel)s/" % kwargs - kwargs["full_boot_summary"] = ( - G_(u"Full Boot Summary: %s") % boot_summary_url) - kwargs["full_build_summary"] = ( - G_(u"Full Build Summary: %s") % build_summary_url) - kwargs["tree_string"] = G_(u"Tree: %(job)s") % kwargs kwargs["branch_string"] = G_(u"Branch: %(git_branch)s") % kwargs kwargs["git_describe_string"] = G_(u"Git Describe: %(kernel)s") % kwargs @@ -496,7 +491,13 @@ def _create_boot_email(**kwargs): kwargs["platforms"] = _parse_and_structure_results(**kwargs) if models.EMAIL_TXT_FORMAT_KEY in email_format: + kwargs["full_boot_summary"] = ( + G_(u"Full Boot Summary: %s") % boot_summary_url) + kwargs["full_build_summary"] = ( + G_(u"Full Build Summary: %s") % build_summary_url) + txt_body = rcommon.create_txt_email("boot.txt", **kwargs) + if models.EMAIL_HTML_FORMAT_KEY in email_format: # Fix the summary URLs for the HTML email. kwargs["full_boot_summary"] = ( @@ -505,6 +506,7 @@ def _create_boot_email(**kwargs): kwargs["full_build_summary"] = ( G_(u"Full Build Summary: <a href=\"%(url)s\">%(url)s</a>") % {"url": build_summary_url}) + html_body = rcommon.create_html_email("boot.html", **kwargs) return txt_body, html_body, subject_str |