Merge lp:~salgado/launchpad-work-items-tracker/use-new-workitems-lp-property into lp:launchpad-work-items-tracker

[Guilherme Salgado]

This changes the collect script to pull work items from both the whiteboard and the new work-items field. It can be deployed now because it will just skip the new field if it doesn't exist.

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'collect'
--- collect	2012-03-06 15:23:49 +0000
+++ collect	2012-03-09 17:45:23 +0000
@@ -216,8 +216,15 @@
         model_bp, model_bp.milestone_name, collector.lp, people_cache=people_cache,
         error_collector=error_collector)
 
-    if bp.workitems_text:
-        for l in bp.workitems_text.splitlines():
+    # Get work items from both the whiteboard and the new workitems_text
+    # property. Once the migration is completed and nobody's using the
+    # whiteboard for work items we can change this to pull work items only
+    # from bp.workitems_text.
+    workitems_text = bp.whiteboard
+    if getattr(bp, 'workitems_text', '') != '':
+        workitems_text += "\n" + bp.workitems_text
+    if workitems_text:
+        for l in workitems_text.splitlines():
             if not in_workitems_block:
                 m = work_items_re.search(l)
                 if m: