Merge lp:~james-w/launchpad-work-items-tracker/multi-project into lp:launchpad-work-items-tracker

[James Westby]

Hi,

This adds a new feature that we need for Linaro, now that we are tracking work
that is going on in multiple projects.

It adds a new configuration option so that you can specify a list of
additional projects to fetch from. I did this to maintain compatibility with
all existing configurations.

Thanks,

James

[Jamie Bennett (jamiebennett)]

Looks like you have a conflict there.

review: Needs Fixing

[James Westby (james-w)]

On Tue, 07 Dec 2010 12:49:43 -0000, Jamie Bennett <email address hidden> wrote:
> Review: Needs Fixing
> Looks like you have a conflict there.

Fixed.

Thanks,

James

[lp:~james-w/launchpad-work-items-tracker/multi-project]

242. By James Westby on 2010-12-07

Merge trunk.

243. By James Westby on 2010-12-07

Drop the now dead inprogress_teams argument.

[Clint Byrum (clint-fewbar)]

Upon running with a single 'extra_projects' defined I get this error:

clint@clint-MacBookPro:~/src/wi/bzr/trunk$ ./collect -d ../natty.db -c ../natty.cfg --debug
Traceback (most recent call last):
  File "./collect", line 962, in <module>
    lp_import(db, cfg, opts.pattern)
  File "./collect", line 569, in lp_import
    import_project(extra_project)
  File "./collect", line 552, in import_project
    lp_import_milestones(lp, db, project_name, True)
TypeError: lp_import_milestones() takes exactly 2 arguments (4 given)

extra_projects = [ 'pipemeter' ]

review: Needs Fixing

[lp:~james-w/launchpad-work-items-tracker/multi-project]

244. By James Westby on 2010-12-08

Fix the error caused by a mismerge.

[Clint Byrum (clint-fewbar)]

Working fine now after revno 244.

review: Approve

=== modified file 'collect'
--- collect	2010-12-08 10:47:18 +0000
+++ collect	2010-12-08 23:15:10 +0000
@@ -546,25 +546,38 @@
 
     lp = Launchpad.login_with('ubuntu-work-items', service_root=EDGE_SERVICE_ROOT)
 
+    urls = []
+
+    def import_project(project):
+        lp_import_milestones(project, db)
+        url = '%s/%s/+specs?batch=300' % (
+                report_tools.blueprints_base_url, project.name)
+        urls.append(url)
+
     if 'release' in cfg:
         lp_project = lp.distributions['ubuntu'].getSeries(name_or_version=cfg['release'])
         url = '%s/ubuntu/%s/+specs?batch=300' % (
                 report_tools.blueprints_base_url, cfg['release'])
+        urls.append(url)
     else:
         assert 'project' in cfg, 'Configuration needs to specify project or release'
         lp_project = lp.projects[cfg['project']]
-        url = '%s/%s/+specs?batch=300' % (
-                report_tools.blueprints_base_url, cfg['project'])
+        import_project(cfg['project'])
+
+    extra_projects = cfg.get('extra_projects', [])
+    for extra_project_name in extra_projects:
+        extra_project = lp.projects[extra_project_name]
+        import_project(extra_project)
 
     lp_import_milestones(lp_project, db)
     lp_import_teams(lp, db, cfg)
 
-    for (bp, (url, milestone)) in lp_blueprints_from_list(url, name_pattern).iteritems():
-        dbg('lp_import(): downloading %s from %s' % (bp, url))
-        contents = urllib.urlopen(url).read().decode('UTF-8')
-        if lp_import_blueprint(db, bp, url, contents):
-            lp_import_blueprint_workitems(lp, db, bp, url, contents, cfg.get('release'))
-
+    for url in urls:
+        for (bp, (url, milestone)) in lp_blueprints_from_list(url, name_pattern).iteritems():
+            dbg('lp_import(): downloading %s from %s' % (bp, url))
+            contents = urllib.urlopen(url).read().decode('UTF-8')
+            if lp_import_blueprint(db, bp, url, contents):
+                lp_import_blueprint_workitems(lp, db, bp, url, contents, cfg.get('release'))
     lp_import_bug_workitems(lp_project, db, cfg)
 
 ########################################################################