Return-Path: X-Original-To: apmail-community-commits-archive@minotaur.apache.org Delivered-To: apmail-community-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D180118FEA for ; Fri, 9 Oct 2015 00:24:23 +0000 (UTC) Received: (qmail 36836 invoked by uid 500); 9 Oct 2015 00:24:23 -0000 Delivered-To: apmail-community-commits-archive@community.apache.org Received: (qmail 36811 invoked by uid 500); 9 Oct 2015 00:24:23 -0000 Mailing-List: contact commits-help@community.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@community.apache.org Delivered-To: mailing list commits@community.apache.org Received: (qmail 36802 invoked by uid 99); 9 Oct 2015 00:24:23 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Oct 2015 00:24:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 37E041A077C for ; Fri, 9 Oct 2015 00:24:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.99 X-Spam-Level: X-Spam-Status: No, score=0.99 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id ER5nCgD4nWKY for ; Fri, 9 Oct 2015 00:24:22 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 480E3439BA for ; Fri, 9 Oct 2015 00:24:22 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 7DD87E0256 for ; Fri, 9 Oct 2015 00:24:21 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id EF9763A03C8 for ; Fri, 9 Oct 2015 00:24:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1707639 - /comdev/reporter.apache.org/trunk/site/getjson.py Date: Fri, 09 Oct 2015 00:24:20 -0000 To: commits@community.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151009002420.EF9763A03C8@svn01-us-west.apache.org> 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: