You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by se...@apache.org on 2015/10/09 02:24:20 UTC

svn commit: r1707639 - /comdev/reporter.apache.org/trunk/site/getjson.py

Author: sebb
Date: Fri Oct  9 00:24:20 2015
New Revision: 1707639

URL: http://svn.apache.org/viewvc?rev=1707639&view=rev
Log:
No point checking JIRA if the pmc uses Bugzilla

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=1707639&r1=1707638&r2=1707639&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/getjson.py (original)
+++ comdev/reporter.apache.org/trunk/site/getjson.py Fri Oct  9 00:24:20 2015
@@ -325,26 +325,27 @@ if m:
             bdata[group] = bugzillastats[group]
         else:
             bdata[group] = [0,0,{}]
-        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:
+            # 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:
                 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: