[whimsy] branch master updated: remove deprecated mailing lists from selection lists

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys 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 45fcc39  remove deprecated mailing lists from selection lists
45fcc39 is described below

commit 45fcc39dcda22c0df4b6aa41d1e28816f5776691
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Aug 17 12:38:50 2017 -0400

    remove deprecated mailing lists from selection lists
    
    See: https://issues.apache.org/jira/browse/WHIMSY-127
---
 lib/whimsy/asf/mail.rb       | 6 ++++++
 www/committers/subscribe.cgi | 1 +
 2 files changed, 7 insertions(+)

diff --git a/lib/whimsy/asf/mail.rb b/lib/whimsy/asf/mail.rb
index 2300755..c916ba6 100644
--- a/lib/whimsy/asf/mail.rb
+++ b/lib/whimsy/asf/mail.rb
@@ -64,6 +64,12 @@ module ASF
       public_private ? @lists : @lists.keys
     end
 
+    # list of mailing lists that aren't actively seeking new subscribers
+    def self.deprecated
+      apmail_bin = ASF::SVN['infra/infrastructure/apmail/trunk/bin']
+      YAML.load_file(File.join(apmail_bin, 'deprecated_mailing_lists.yml'))
+    end
+
     # which lists are available for subscription via Whimsy?
     def self.cansub(member, pmc_chair)
       Mail._load_lists
diff --git a/www/committers/subscribe.cgi b/www/committers/subscribe.cgi
index fd599a3..a424e93 100755
--- a/www/committers/subscribe.cgi
+++ b/www/committers/subscribe.cgi
@@ -33,6 +33,7 @@ ASF::Podling.list.each {|p|
 
 pmcs = ASF::Committee.pmcs.map(&:mail_list)
 lists = ASF::Mail.cansub(user.asf_member?, ASF.pmc_chairs.include?(user))
+lists -= ASF::Mail.deprecated
 lists.sort!
 addrs = user.all_mail
 

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