Author: sebb
Date: Fri Oct 9 07:59:29 2015
New Revision: 1707670
URL: http://svn.apache.org/viewvc?rev=1707670&view=rev
Log:
Revert recent change: a PMC may use Bugzilla and JIRA for its projects (e.g.
Tomcat)
Modified:
comdev/reporter.apache.org/trunk/site/getjson.py
Modified: comdev/reporter.apache.org/trunk/site/getjson.py
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/getjson.py?rev=1707670&r1=1707669&r2=1707670&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/getjson.py (original)
+++ comdev/reporter.apache.org/trunk/site/getjson.py Fri Oct 9 07:59:29 2015
@@ -325,27 +325,27 @@ if m:
bdata[group] = bugzillastats[group]
else:
bdata[group] = [0,0,{}]
- # only update the JIRA data if the project is *not* in bugzilla
- jiraname = group.upper()
- if group in jmap:
- for jiraname in jmap[group]:
- x,y, p = getJIRAS(jiraname)
- jdata[group][0] += x
- jdata[group][1] += y
- jdata[group][2] = p
- elif group in ddata and 'name' in ddata[group]:
- jiras = getJIRAProjects(ddata[group]['name'])
- keys[group] = jiras
- for jiraname in jiras:
- x,y, p= getJIRAS(jiraname)
- jdata[group][0] += x
- jdata[group][1] += y
- jdata[group][2] = p
- elif jiraname:
+ # a PMC may have projects using Bugzilla *and* JIRA - e.g. Tomcat -
(or neither)
+ jiraname = group.upper()
+ if group in jmap:
+ for jiraname in jmap[group]:
+ x,y, p = getJIRAS(jiraname)
+ jdata[group][0] += x
+ jdata[group][1] += y
+ jdata[group][2] = p
+ elif group in ddata and 'name' in ddata[group]:
+ jiras = getJIRAProjects(ddata[group]['name'])
+ keys[group] = jiras
+ for jiraname in jiras:
x,y, p= getJIRAS(jiraname)
jdata[group][0] += x
jdata[group][1] += y
jdata[group][2] = p
+ elif jiraname:
+ x,y, p= getJIRAS(jiraname)
+ jdata[group][0] += x
+ jdata[group][1] += y
+ jdata[group][2] = p
cdata[group] = cdata[xgroup] if xgroup in cdata else {'pmc': {},
'committer': {}}
for pmc in pchanges:
