whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: cleanup
Date Mon, 13 Jun 2016 20:21:14 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  ee08158   cleanup
ee08158 is described below

commit ee081587c6d0a02bfa609b3ed7dc5295d27e24f4
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Mon Jun 13 16:21:03 2016 -0400

    cleanup
---
 lib/whimsy/asf/rack.rb     | 2 +-
 www/board/agenda/config.ru | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/whimsy/asf/rack.rb b/lib/whimsy/asf/rack.rb
index 50b8cb6..f5c3295 100644
--- a/lib/whimsy/asf/rack.rb
+++ b/lib/whimsy/asf/rack.rb
@@ -64,7 +64,7 @@ module ASF
         @block = block 
       end
 
-      def call(env, &block)
+      def call(env)
         authorized = ( ENV['RACK_ENV'] == 'test' )
 
         person = ASF::Auth.decode(env)
diff --git a/www/board/agenda/config.ru b/www/board/agenda/config.ru
index 694c5bb..6bd8658 100644
--- a/www/board/agenda/config.ru
+++ b/www/board/agenda/config.ru
@@ -6,9 +6,11 @@ require 'whimsy/asf/rack'
 use ASF::Auth::MembersAndOfficers do |env|
   # additionally authorize all invited guests
   agenda = dir('board_agenda_*.txt').sort.last
-  Agenda.parse(agenda, :full)
-  roll = Agenda[agenda][:parsed].find {|item| item['title'] == 'Roll Call'}
-  roll['people'].keys.include? env['REMOTE_USER']
+  if agenda
+    Agenda.parse(agenda, :full)
+    roll = Agenda[agenda][:parsed].find {|item| item['title'] == 'Roll Call'}
+    roll['people'].keys.include? env['REMOTE_USER']
+  end
 end
 
 use ASF::HTTPS_workarounds

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

Mime
View raw message