whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: ensure chair is a member of PMC
Date Tue, 19 Apr 2016 14:02:21 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  d0386da   ensure chair is a member of PMC
d0386da is described below

commit d0386daf3a8bda043bf7b4814157090cc332efd5
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Tue Apr 19 10:01:59 2016 -0400

    ensure chair is a member of PMC
---
 lib/whimsy/asf/agenda/special.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/whimsy/asf/agenda/special.rb b/lib/whimsy/asf/agenda/special.rb
index 376e873..0d45a1c 100644
--- a/lib/whimsy/asf/agenda/special.rb
+++ b/lib/whimsy/asf/agenda/special.rb
@@ -91,14 +91,19 @@ class ASF::Board::Agenda
             if chairname =~ /\s\(([-.\w]+)\)$/
               # if chair's id is present in parens, use that value
               attrs['chair'] = $1 unless $1.empty?
+              chairname.sub! /\s+\(.*\)$/, ''
             else
               # match chair's name against people in the committee
               chair = people.find {|person| person.first == chairname}
               attrs['chair'] = (chair ? chair.last : nil)
             end
 
-            unless attrs['chair']
-              attrs['warnings'] ||= ['Chair not found in resolution'] 
+            unless people.include? [chairname, attrs['chair']]
+              if attrs['chair']
+                attrs['warnings'] ||= ['Chair not member of PMC'] 
+              else
+                attrs['warnings'] ||= ['Chair not found in resolution'] 
+              end
             end
           else
             attrs['warnings'] ||= ['Chair not found in resolution'] 

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message