Merge lp:~cjohnston/launchpad-work-items-tracker/fix-none-whiteboard into lp:launchpad-work-items-tracker

Proposed by Chris Johnston
Status: Merged
Merged at revision: 293
Proposed branch: lp:~cjohnston/launchpad-work-items-tracker/fix-none-whiteboard
Merge into: lp:launchpad-work-items-tracker
Diff against target: 12 lines (+2/-0)
1 file modified
collect (+2/-0)
To merge this branch: bzr merge lp:~cjohnston/launchpad-work-items-tracker/fix-none-whiteboard
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+99335@code.launchpad.net

Commit message

This branch adds a check for the whiteboard being None before concatenating the workitems_text prior to parsing.

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote :

This is the same merge that was applied to status.linaro.org

Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'collect'
--- collect 2012-03-09 17:39:06 +0000
+++ collect 2012-03-26 14:02:47 +0000
@@ -221,6 +221,8 @@
221 # whiteboard for work items we can change this to pull work items only221 # whiteboard for work items we can change this to pull work items only
222 # from bp.workitems_text.222 # from bp.workitems_text.
223 workitems_text = bp.whiteboard223 workitems_text = bp.whiteboard
224 if workitems_text is None:
225 workitems_text = ''
224 if getattr(bp, 'workitems_text', '') != '':226 if getattr(bp, 'workitems_text', '') != '':
225 workitems_text += "\n" + bp.workitems_text227 workitems_text += "\n" + bp.workitems_text
226 if workitems_text:228 if workitems_text:

Subscribers

People subscribed via source and target branches

to all changes: