[whimsy] branch master updated: Rename for clarity

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new a9b9a893 Rename for clarity
a9b9a893 is described below

commit a9b9a893f43f283e95f6eddffc175e503918f42e
Author: Sebb <s...@apache.org>
AuthorDate: Sat Aug 12 14:14:36 2023 +0100

    Rename for clarity
---
 www/secretary/ldap-check.cgi | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/www/secretary/ldap-check.cgi b/www/secretary/ldap-check.cgi
index f2df4dc9..0c68ddaf 100755
--- a/www/secretary/ldap-check.cgi
+++ b/www/secretary/ldap-check.cgi
@@ -36,8 +36,8 @@ _html do
 
   _h1 'LDAP membership checks'
 
-  old = ASF::Group['committers'].memberids
-  new = ASF::Committer.listids
+  cmtgrp = ASF::Group['committers'].memberids # cn=committers,ou=groups
+  cmtrol = ASF::Committer.listids # cn=committers,ou=role
   people = ASF::Person.preload(%w(uid createTimestamp asf-banned asf-altEmail 
mail loginShell))
 
   # fetch the email details up front to avoid rescanning
@@ -92,8 +92,8 @@ _html do
         po_cm = []
       end
       notc=[]
-      notc += po.reject {|n| old.include? n}
-      notc += pm.reject {|n| old.include? n}
+      notc += po.reject {|n| cmtgrp.include? n}
+      notc += pm.reject {|n| cmtgrp.include? n}
       if po_pm.size > 0 or cm_po.size > 0 or po_cm.size > 0 or notc.size > 0
         _tr do
           _td do
@@ -134,7 +134,7 @@ _html do
 
   _h2 'people who are not committers (excluding nologin)'
 
-  non_committers = people.reject { |p| p.nologin? or old.include? p.name or 
p.name == 'apldaptest'}
+  non_committers = people.reject { |p| p.nologin? or cmtgrp.include? p.name or 
p.name == 'apldaptest'}
   if non_committers.length > 0
     _table do
       _tr do
@@ -199,7 +199,7 @@ _html do
       _th 'Login'
       _th 'Projects (if any)'
     end
-    people.select {|p| p.inactive? and new.include? 
p.name}.sort_by(&:name).each do |p|
+    people.select {|p| p.inactive? and cmtrol.include? 
p.name}.sort_by(&:name).each do |p|
       _tr do
         _td do
           _a p.name, href: '/roster/committer/' + p.name
@@ -234,7 +234,7 @@ _html do
   _h2 'committers who are not in LDAP people'
 
   # which committers are not people?
-  non_people = old.reject {|id| people.map(&:name).include? id}
+  non_people = cmtgrp.reject {|id| people.map(&:name).include? id}
 
   if non_people.length > 0
     _table do
@@ -264,8 +264,8 @@ _html do
     _ 'These should agree'
   end
 
-  new_old = new - old
-  old_new = old - new
+  new_old = cmtrol - cmtgrp
+  old_new = cmtgrp - cmtrol
 
   if new_old.size > 0
     _p do
@@ -285,4 +285,4 @@ _html do
     end
   end
 
-end
\ No newline at end of file
+end