Launchpad itself

Merge lp:~cjwatson/launchpad/oops-revision into lp:launchpad

  1. oops-revision
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18858
Proposed branch: lp:~cjwatson/launchpad/oops-revision
Merge into: lp:launchpad
Diff against target: 14 lines (+1/-3)
1 file modified
lib/lp/services/webapp/errorlog.py (+1/-3)
To merge this branch: bzr merge lp:~cjwatson/launchpad/oops-revision
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+362143@code.launchpad.net

Commit message

Use 'revision' rather than 'revno' in OOPSes, now that python-oops-tools supports that.

Description of the change

This makes a bit more sense for Git.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/services/webapp/errorlog.py'
2--- lib/lp/services/webapp/errorlog.py 2017-09-02 13:44:28 +0000
3+++ lib/lp/services/webapp/errorlog.py 2019-01-23 17:06:08 +0000
4@@ -282,9 +282,7 @@
5 # What do we want in our reports?
6 # Constants:
7 self._oops_config.template['branch_nick'] = versioninfo.branch_nick
8- # XXX cjwatson 2016-09-14: This should really be 'revision', but
9- # that requires coordination with python-oops-tools.
10- self._oops_config.template['revno'] = versioninfo.revision
11+ self._oops_config.template['revision'] = versioninfo.revision
12 reporter = config[self._default_config_section].oops_prefix
13 if section_name != self._default_config_section:
14 reporter = '%s-%s' % (reporter, section_name)