You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by Sam Ruby <ru...@apache.org> on 2015/12/04 20:20:20 UTC
[whimsy.git] [49/50] Commit cdf8348: httpcomponents => hc; permit empire-db
Commit cdf83488f6952a1f2c5f3709c635d8bb150ef549:
httpcomponents => hc; permit empire-db
git-svn-id: https://svn.apache.org/repos/infra/infrastructure/trunk/projects/whimsy@820823 90ea9780-b833-de11-8433-001ec94261de
Branch: refs/heads/master
Author: Sam Ruby <ru...@apache.org>
Committer: Sam Ruby <ru...@apache.org>
Pusher: rubys <ru...@apache.org>
------------------------------------------------------------
www/officers/mlreq.cgi | ++++++ ------
------------------------------------------------------------
12 changes: 6 additions, 6 deletions.
------------------------------------------------------------
diff --git a/www/officers/mlreq.cgi b/www/officers/mlreq.cgi
index 716ba98..e694896 100755
--- a/www/officers/mlreq.cgi
+++ b/www/officers/mlreq.cgi
@@ -15,6 +15,9 @@ apmail_bin = ASF::SVN['infra/infrastructure/apmail/trunk/bin']
lists = File.read(File.join(apmail_bin, '.archives')).
scan(/^\s+"(\w[-\w]+)", "\/home\/apmail\//).flatten
+pmcs = ASF::Committee.list.map(&:name) - %w(httpcomponents) + %w(hc)
+pmcs.delete_if {|pmc| not lists.include? "#{pmc}-private"}
+
_html do
incubator = (env['PATH_INFO'].to_s.include? 'incubator')
@@ -67,10 +70,8 @@ _html do
placeholder: 'name'
_ '@'
_select name: 'subdomain' do
- pmcs = ASF::Committee.list.map(&:name) - %w(incubator)
- lists.grep(/^\w+-private$/).sort.each do |list|
- list = list.chomp('-private')
- _option list if pmcs.include? list
+ pmcs.sort.each do |pmc|
+ _option pmc unless pmc == 'incubator'
end
end
_ '.'
@@ -174,8 +175,7 @@ _html do
end
end
- unless lists.include? "#{@subdomain}-private" and
- ASF::Committee.list.map(&:name).include? @subdomain
+ unless pmcs.include? @subdomain
errors << "Invalid pmc: #{subdomain}"
end
end