[whimsy] branch master updated: Strip lines at source

[se...@apache.org]

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 7227ba3  Strip lines at source
7227ba3 is described below

commit 7227ba3be4c9bececfbf9ed72cf4973ccda8c276
Author: Sebb <se...@apache.org>
AuthorDate: Thu Jun 22 12:56:09 2017 +0100

    Strip lines at source
---
 lib/whimsy/asf/mlist.rb       | 4 ++--
 www/board/subscriptions.cgi   | 6 +++---
 www/members/subscriptions.cgi | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/whimsy/asf/mlist.rb b/lib/whimsy/asf/mlist.rb
index 7579ba9..c42a700 100644
--- a/lib/whimsy/asf/mlist.rb
+++ b/lib/whimsy/asf/mlist.rb
@@ -12,14 +12,14 @@ module ASF
     def self.board_subscribers
       # yield the list of board subscribers
       File.readlines(BOARD_SUBSCRIPTIONS).each do |line|
-        yield line
+        yield line.strip
       end
     end
 
     def self.members_subscribers
       # yield the list of subscribers to members@
       File.readlines(MEMBERS_SUBSCRIPTIONS).each do |line|
-        yield line
+        yield line.strip
       end
     end
 
diff --git a/www/board/subscriptions.cgi b/www/board/subscriptions.cgi
index 2b020e9..1f1b641 100755
--- a/www/board/subscriptions.cgi
+++ b/www/board/subscriptions.cgi
@@ -73,8 +73,8 @@ _html do
     maillist = ASF::Mail.list
 
     ASF::MLIST.board_subscribers do |line|
-      person = maillist[line.downcase.strip]
-      person ||= maillist[line.downcase.strip.sub(/\+\w+@/,'@')]
+      person = maillist[line.downcase]
+      person ||= maillist[line.downcase.sub(/\+\w+@/,'@')]
       if person
         id = person.id
         id = '*notinavail*' if id == 'notinavail'
@@ -82,7 +82,7 @@ _html do
         person = ASF::Person.find('notinavail')
         id = '*missing*'
       end
-      ids << [id, person, line.strip]
+      ids << [id, person, line]
     end
 
     _table_ border: '1', cellpadding: '2', cellspacing: '0' do
diff --git a/www/members/subscriptions.cgi b/www/members/subscriptions.cgi
index 3009453..4f103dc 100755
--- a/www/members/subscriptions.cgi
+++ b/www/members/subscriptions.cgi
@@ -68,8 +68,8 @@ _html do
 
     subscriptions = []
     ASF::MLIST.members_subscribers do |line|
-      person = maillist[line.downcase.strip]
-      person ||= maillist[line.downcase.strip.sub(/\+\w+@/,'@')]
+      person = maillist[line.downcase]
+      person ||= maillist[line.downcase.sub(/\+\w+@/,'@')]
       if person
         id = person.id
         id = '*notinavail*' if id == 'notinavail'
@@ -77,7 +77,7 @@ _html do
         person = ASF::Person.find('notinavail')
         id = '*missing*'
       end
-      subscriptions << [id, person, line.strip]
+      subscriptions << [id, person, line]
     end
 
     _table.table do

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