Launchpad itself

Merge lp:~allenap/launchpad/trac-fixreleased-bug-667340 into lp:launchpad

  1. trac-fixreleased-bug-667340
  2. Merge into devel
Proposed by Gavin Panella on 2010-11-10
Status: Merged
Approved by: Graham Binns on 2010-11-10
Approved revision: no longer in the source branch.
Merged at revision: 11897
Proposed branch: lp:~allenap/launchpad/trac-fixreleased-bug-667340
Merge into: lp:launchpad
Diff against target: 41 lines (+6/-3)
3 files modified
lib/lp/bugs/doc/externalbugtracker-trac.txt (+2/-0)
lib/lp/bugs/externalbugtracker/trac.py (+3/-1)
utilities/generate-external-bug-status-docs (+1/-2)
To merge this branch: bzr merge lp:~allenap/launchpad/trac-fixreleased-bug-667340
Reviewer Review Type Date Requested Status
Graham Binns (community) code 2010-11-10 Approve on 2010-11-10
Review via email: mp+40507@code.launchpad.net

Commit Message

[r=gmb][ui=none][bug=667340] Add a new 'fixverified' status mapping for Trac external bug trackers. Maps to 'Fix Released'.

Description of the Change

Adds a new 'fixreleased' status mapping for Trac external bug trackers. Maps to 'Fix Released'.

Also fix an import in very-infrequently-used script generate-external-bug-status-docs.

To post a comment you must log in.
Graham Binns (gmb) :
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/bugs/doc/externalbugtracker-trac.txt'
2--- lib/lp/bugs/doc/externalbugtracker-trac.txt 2010-10-18 22:24:59 +0000
3+++ lib/lp/bugs/doc/externalbugtracker-trac.txt 2010-11-10 09:34:46 +0000
4@@ -139,6 +139,8 @@
5 'Confirmed'
6 >>> trac.convertRemoteStatus('worksforme').title
7 'Invalid'
8+ >>> trac.convertRemoteStatus('fixverified').title
9+ 'Fix Released'
10
11 If the status isn't one that our Trac ExternalBugTracker can understand
12 an UnknownRemoteStatusError will be raised.
13
14=== modified file 'lib/lp/bugs/externalbugtracker/trac.py'
15--- lib/lp/bugs/externalbugtracker/trac.py 2010-08-20 20:31:18 +0000
16+++ lib/lp/bugs/externalbugtracker/trac.py 2010-11-10 09:34:46 +0000
17@@ -274,7 +274,9 @@
18 # XXX: 2007-08-06 Graham Binns:
19 # We should follow dupes if possible.
20 ('accepted', 'assigned', 'duplicate', BugTaskStatus.CONFIRMED),
21- ('fixed', 'closed', BugTaskStatus.FIXRELEASED),
22+ # Status fixverified added for bug 667340, for http://trac.yorba.org/,
23+ # but could be generally useful so adding here.
24+ ('fixed', 'closed', 'fixverified', BugTaskStatus.FIXRELEASED),
25 ('invalid', 'worksforme', BugTaskStatus.INVALID),
26 ('wontfix', BugTaskStatus.WONTFIX),
27 )
28
29=== modified file 'utilities/generate-external-bug-status-docs'
30--- utilities/generate-external-bug-status-docs 2010-04-27 19:48:39 +0000
31+++ utilities/generate-external-bug-status-docs 2010-11-10 09:34:46 +0000
32@@ -27,8 +27,7 @@
33 from itertools import chain
34 from optparse import OptionParser
35
36-from canonical.launchpad.components.externalbugtracker import (
37- BUG_TRACKER_CLASSES)
38+from lp.bugs.externalbugtracker import BUG_TRACKER_CLASSES
39
40
41 def generate_blank_lines(num):