Launchpad itself

Merge lp:~wallyworld/launchpad/oops-bug-filing-location into lp:launchpad

  1. oops-bug-filing-location
  2. Merge into devel
Proposed by Ian Booth
Status: Merged
Approved by: Ian Booth
Approved revision: no longer in the source branch.
Merged at revision: 12095
Proposed branch: lp:~wallyworld/launchpad/oops-bug-filing-location
Merge into: lp:launchpad
Diff against target: 57 lines (+6/-6)
3 files modified
lib/launchpad_loggerhead/app.py (+4/-4)
lib/lp/code/browser/sourcepackagerecipe.py (+1/-1)
lib/lp/registry/model/person.py (+1/-1)
To merge this branch: bzr merge lp:~wallyworld/launchpad/oops-bug-filing-location
Reviewer Review Type Date Requested Status
Steve Kowalik (community) code* Approve
Review via email: mp+44005@code.launchpad.net

Commit message

[r=stevenk][ui=none][bug=691343] Change some project based bugs urls to just launchpad ones

Description of the change

= Summary =

Trivial fix to remove references such as http://bug.launchpad.net/launchpad-code and replace with http://bug.launchpad.net/launchpad

= Implementation =

Change some urls.

= Tests =

None

= Lint =

(all existing issues)

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/launchpad_loggerhead/app.py
  lib/lp/code/browser/sourcepackagerecipe.py
  lib/lp/registry/model/person.py

./lib/launchpad_loggerhead/app.py
      99: E231 missing whitespace after ':'
     237: E301 expected 1 blank line, found 0
     336: E301 expected 1 blank line, found 0
     227: Line exceeds 78 characters.
     250: Line exceeds 78 characters.
     288: Line exceeds 78 characters.
     332: Line exceeds 78 characters.
     333: Line exceeds 78 characters.
     354: Line exceeds 78 characters.

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

Do it, except the URLs currently redirect anyway.

review: Approve (code*)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/launchpad_loggerhead/app.py'
--- lib/launchpad_loggerhead/app.py 2010-08-03 00:22:37 +0000
+++ lib/launchpad_loggerhead/app.py 2010-12-17 04:53:55 +0000
@@ -257,8 +257,8 @@
257<h1>Oops!</h1>257<h1>Oops!</h1>
258<p>Something broke while generating the page.258<p>Something broke while generating the page.
259Please try again in a few minutes, and if the problem persists file a bug at259Please try again in a few minutes, and if the problem persists file a bug at
260<a href="https://bugs.launchpad.net/launchpad-code"260<a href="https://bugs.launchpad.net/launchpad"
261>https://bugs.launchpad.net/launchpad-code</a>261>https://bugs.launchpad.net/launchpad</a>
262and quote OOPS-ID <strong>%(oopsid)s</strong>262and quote OOPS-ID <strong>%(oopsid)s</strong>
263</p></body></html>'''263</p></body></html>'''
264264
@@ -271,7 +271,7 @@
271 """Wraps start_response (from a WSGI request) to keep track of whether271 """Wraps start_response (from a WSGI request) to keep track of whether
272 start_response was called (and whether the callable it returns has been272 start_response was called (and whether the callable it returns has been
273 called).273 called).
274 274
275 Used by oops_middleware.275 Used by oops_middleware.
276 """276 """
277277
@@ -324,7 +324,7 @@
324 [], URL=construct_url(environ))324 [], URL=construct_url(environ))
325 error_utility.raising(sys.exc_info(), request)325 error_utility.raising(sys.exc_info(), request)
326 return request.oopsid326 return request.oopsid
327 327
328328
329def oops_middleware(app):329def oops_middleware(app):
330 """Middleware to log an OOPS if the request fails.330 """Middleware to log an OOPS if the request fails.
331331
=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py 2010-12-13 08:23:15 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py 2010-12-17 04:53:55 +0000
@@ -95,7 +95,7 @@
95 'We\'re still working on source package recipes. '95 'We\'re still working on source package recipes. '
96 'We would love for you to try them out, and if you have '96 'We would love for you to try them out, and if you have '
97 'any issues, please '97 'any issues, please '
98 '<a href="http://bugs.launchpad.net/launchpad-code">'98 '<a href="http://bugs.launchpad.net/launchpad">'
99 'file a bug</a>. We\'ll be happy to fix any problems you encounter.')99 'file a bug</a>. We\'ll be happy to fix any problems you encounter.')
100100
101101
102102
=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py 2010-12-16 19:27:54 +0000
+++ lib/lp/registry/model/person.py 2010-12-17 04:53:55 +0000
@@ -307,7 +307,7 @@
307 Note that it performs poorly at least some of the time, and if307 Note that it performs poorly at least some of the time, and if
308 EmailAddress and Person are already being queried, its probably better to308 EmailAddress and Person are already being queried, its probably better to
309 query Account directly. See bug309 query Account directly. See bug
310 https://bugs.launchpad.net/launchpad-registry/+bug/615237 for some310 https://bugs.launchpad.net/launchpad/+bug/615237 for some
311 corroborating information.311 corroborating information.
312 """312 """
313313