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 ed8acc3  Use generic list_mod method instead of incubator_mods
ed8acc3 is described below

commit ed8acc34dff71ef811b2e11312866c2d1f971b67
Author: Sebb <[email protected]>
AuthorDate: Thu Jun 29 19:02:05 2017 +0100

    Use generic list_mod method instead of incubator_mods
---
 lib/whimsy/asf/mlist.rb      | 10 ----------
 www/incubator/moderators.cgi |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/whimsy/asf/mlist.rb b/lib/whimsy/asf/mlist.rb
index b7e8999..a5cb6b7 100644
--- a/lib/whimsy/asf/mlist.rb
+++ b/lib/whimsy/asf/mlist.rb
@@ -23,16 +23,6 @@ module ASF
       end
     end
 
-    # return a hash of incubator moderators
-    # list-name => [subscribers]
-    def self.incubator_mods
-      moderators = Hash[File.read(LIST_MODS).split(/\n\n/).
-        select {|k,v| k =~ /incubator.apache.org/ && k !~ 
/\/infra-(dev2?|[a-z])\//}.
-        map {|stanza| [stanza[/incubator.apache.org\/(.*)\//,1],
-        stanza.scan(/^(.*@.*)/).flatten]}]
-      moderators
-    end
-
     # return a hash of subscriptions for the list of emails provided
     def self.subscriptions(emails, response = {})
       
diff --git a/www/incubator/moderators.cgi b/www/incubator/moderators.cgi
index bc169fa..a362b23 100755
--- a/www/incubator/moderators.cgi
+++ b/www/incubator/moderators.cgi
@@ -68,7 +68,7 @@ _html do
 
     _h1 'Apache Incubator moderators'
 
-    moderators = ASF::MLIST.incubator_mods
+    moderators = ASF::MLIST.list_moderators('incubator')[0]
 
     _h1 'Index'
 
@@ -112,7 +112,7 @@ _html do
         current = podling
       end
 
-      _h3_ list.sub(podling, '')
+      _h3_ list.sub(podling, '').sub('@incubator.apache.org',  '')
 
       _table do
         moderators[list].sort.each do |moderator|

-- 
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].

Reply via email to