You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2019/01/11 01:49:06 UTC

[whimsy] branch master updated: Allow ASF lists to be matched

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 72691a9  Allow ASF lists to be matched
72691a9 is described below

commit 72691a9b4f9ce56a71d1829a0abba0bf15e356a5
Author: Sebb <se...@apache.org>
AuthorDate: Fri Jan 11 01:48:53 2019 +0000

    Allow ASF lists to be matched
---
 lib/whimsy/asf/mlist.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/whimsy/asf/mlist.rb b/lib/whimsy/asf/mlist.rb
index 386160e..6035e80 100644
--- a/lib/whimsy/asf/mlist.rb
+++ b/lib/whimsy/asf/mlist.rb
@@ -24,6 +24,7 @@ module ASF
 
     # Return an array of private@pmc subscribers followed by the file update time
     # By default does not return the standard archivers
+    # TODO - does this need to be updated for non-PMC committees?
     def self.private_subscribers(pmc, archivers=false)
       return list_filter('sub', "#{pmc}.apache.org", 'private', archivers), (File.mtime(LIST_TIME) rescue File.mtime(LIST_SUBS))
     end
@@ -114,7 +115,10 @@ module ASF
         # possible podling styles (new, old):
         #/home/apmail/lists/batchee.apache.org/dev/mod
         #/home/apmail/lists/incubator.apache.org/blur-dev/mod
+        #Apache lists (e.g. some non-PMCs)
+        #/home/apmail/lists/apache.org/list/mod
         next unless "#{mail_domain}.apache.org" == dom or
+           (dom == 'apache.org' &&  list =~ /^#{mail_domain}(-|$)/) or
            (podling && dom == 'incubator.apache.org' && list =~ /^#{mail_domain}-/)
         moderators["#{list}@#{dom}"] = subs.sort
       end
@@ -140,7 +144,10 @@ module ASF
         # possible podling styles (new, old):
         #/home/apmail/lists/batchee.apache.org/dev/mod
         #/home/apmail/lists/incubator.apache.org/blur-dev/mod
+        #Apache lists (e.g. some non-PMCs)
+        #/home/apmail/lists/apache.org/list/mod
         next unless "#{mail_domain}.apache.org" == dom or
+           (dom == 'apache.org' &&  list =~ /^#{mail_domain}(-|$)/) or
            (podling && dom == 'incubator.apache.org' && list =~ /^#{mail_domain}-/)
         subscribers["#{list}@#{dom}"] = list_subs ? subs.sort : subs.size
       end