[whimsy] branch master updated: Mentor mail matching not working

[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 991ce93  Mentor mail matching not working
991ce93 is described below

commit 991ce935b9fd92dc347c22f19ed930e672f5ddd1
Author: Sebb <s...@apache.org>
AuthorDate: Sat Apr 6 00:35:11 2019 +0100

    Mentor mail matching not working
---
 www/roster/models/ppmc.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/roster/models/ppmc.rb b/www/roster/models/ppmc.rb
index d8ea242..a833508 100644
--- a/www/roster/models/ppmc.rb
+++ b/www/roster/models/ppmc.rb
@@ -67,7 +67,7 @@ class PPMC
     # Merge the PPMC members (owners)
     owners.each do |person|
       notSubbed = false
-      if analysePrivateSubs and owners.include? person
+      if analysePrivateSubs
         allMail = person.all_mail.map{|m| ASF::Mail.to_canonical(m.downcase)}
         notSubbed = (allMail & pSubs.map{|m| ASF::Mail.to_canonical(m)}).empty?
         unMatchedSubs.delete_if {|k| allMail.include? 
ASF::Mail.to_canonical(k.downcase)}
@@ -95,7 +95,7 @@ class PPMC
       }
       if analysePrivateSubs
         allMail = person.all_mail.map{|m| ASF::Mail.to_canonical(m.downcase)}
-        roster[person.id]['notSubbed'] = (allMail & pSubs).empty?
+        roster[person.id]['notSubbed'] = (allMail & pSubs.map{|m| 
ASF::Mail.to_canonical(m)}).empty?
         unMatchedSubs.delete_if {|k| allMail.include? 
ASF::Mail.to_canonical(k.downcase)}
       end
     end