Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8D27F200497 for ; Wed, 23 Aug 2017 19:14:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8B783169262; Wed, 23 Aug 2017 17:14:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D2A40169259 for ; Wed, 23 Aug 2017 19:14:51 +0200 (CEST) Received: (qmail 47090 invoked by uid 500); 23 Aug 2017 17:14:51 -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 47081 invoked by uid 99); 23 Aug 2017 17:14:50 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Aug 2017 17:14:50 +0000 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 3E2D93A002A for ; Wed, 23 Aug 2017 17:14:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1805939 - /comdev/reporter.apache.org/trunk/scripts/parsepmcs.py Date: Wed, 23 Aug 2017 17:14:47 -0000 To: commits@community.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170823171449.3E2D93A002A@svn01-us-west.apache.org> archived-at: Wed, 23 Aug 2017 17:14:52 -0000 Author: sebb Date: Wed Aug 23 17:14:46 2017 New Revision: 1805939 URL: http://svn.apache.org/viewvc?rev=1805939&view=rev Log: Use ldap_projects in preference to groups Drop nonldap_groups entirely Modified: comdev/reporter.apache.org/trunk/scripts/parsepmcs.py Modified: comdev/reporter.apache.org/trunk/scripts/parsepmcs.py URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/scripts/parsepmcs.py?rev=1805939&r1=1805938&r2=1805939&view=diff ============================================================================== --- comdev/reporter.apache.org/trunk/scripts/parsepmcs.py (original) +++ comdev/reporter.apache.org/trunk/scripts/parsepmcs.py Wed Aug 23 17:14:46 2017 @@ -131,6 +131,7 @@ stamp = int(time.time()) c_info = loadJson('https://whimsy.apache.org/public/committee-info.json')['committees'] ldappeople = loadJson('https://whimsy.apache.org/public/public_ldap_people.json')['people'] +ldapprojs = loadJson('https://whimsy.apache.org/public/public_ldap_projects.json')['projects'] ldapgroups = loadJson('https://whimsy.apache.org/public/public_ldap_groups.json')['groups'] for group in c_info: @@ -138,28 +139,18 @@ for group in c_info: for cid in c_info[group]['roster']: updateCommittees(stamp, group, cid) +for proj in ldapprojs: + if proj in c_info: + for cid in ldapprojs[proj]['members']: + updateProjects(stamp, proj, cid) + +# only security and concom left for group in ldapgroups: - if group != 'committers' and group in c_info: + if group != 'committers' and group in c_info and not group in ldapprojs: for cid in ldapgroups[group]['roster']: updateProjects(stamp, group, cid) -""" - Check for inconsistencies in non-ldap groups -""" - -nonldapgroups = loadJson('https://whimsy.apache.org/public/public_nonldap_groups.json')['groups'] -for nongroup in sorted(nonldapgroups): - if nongroup in ldapgroups: -# Don't mail; the group might be still in use if the LDAP defn has yet to be added - print("WARN: duplicate definition of non-ldap group '%s'" % nongroup) - else: - if nongroup in projects: - print("Dropping non-ldap group %s" % nongroup) - del projects[nongroup] -# else: # e.g. podling or special interest group -# print("Not found non-ldap group %s" % nongroup) - # Delete retired members ret = 0 for project in projects: