Launchpad itself

Merge lp:~wgrant/launchpad/fix-codebrowse-oopses into lp:launchpad

  1. fix-codebrowse-oopses
  2. Merge into devel
Proposed by William Grant
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 13760
Proposed branch: lp:~wgrant/launchpad/fix-codebrowse-oopses
Merge into: lp:launchpad
Diff against target: 18 lines (+2/-2)
1 file modified
lib/launchpad_loggerhead/app.py (+2/-2)
To merge this branch: bzr merge lp:~wgrant/launchpad/fix-codebrowse-oopses
Reviewer Review Type Date Requested Status
Steve Kowalik (community) code Approve
Review via email: mp+72515@code.launchpad.net

Commit message

Fix launchpad_loggerhead's OOPS page template to work with the new oops_wsgi.

Description of the change

launchpad_loggerhead's OOPS page template uses %(oopsid)s, when oops_wsgi provides %(id)s. Let's fix that so the OOPS handler stops crashing.

To post a comment you must log in.
Revision history for this message
Steve Kowalik (stevenk) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/launchpad_loggerhead/app.py'
2--- lib/launchpad_loggerhead/app.py 2011-08-18 03:32:33 +0000
3+++ lib/launchpad_loggerhead/app.py 2011-08-23 01:40:25 +0000
4@@ -248,14 +248,14 @@
5 # - Andrew Bennetts, 2010-07-27.
6 _oops_html_template = '''\
7 <html>
8-<head><title>Oops! %(oopsid)s</title></head>
9+<head><title>Oops! %(id)s</title></head>
10 <body>
11 <h1>Oops!</h1>
12 <p>Something broke while generating the page.
13 Please try again in a few minutes, and if the problem persists file a bug at
14 <a href="https://bugs.launchpad.net/launchpad"
15 >https://bugs.launchpad.net/launchpad</a>
16-and quote OOPS-ID <strong>%(oopsid)s</strong>
17+and quote OOPS-ID <strong>%(id)s</strong>
18 </p></body></html>'''
19
20