[whimsy] branch master updated: Check for ICLA directory with user name

[sebb]

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 7e5fd4a  Check for ICLA directory with user name
7e5fd4a is described below

commit 7e5fd4a4406c3eef1bb29cc260c83fb5420f3393
Author: Sebb <s...@apache.org>
AuthorDate: Sun Oct 21 18:57:49 2018 +0100

    Check for ICLA directory with user name
---
 www/secretary/workbench/views/actions/icla.json.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/secretary/workbench/views/actions/icla.json.rb 
b/www/secretary/workbench/views/actions/icla.json.rb
index 2806401..02f86c5 100644
--- a/www/secretary/workbench/views/actions/icla.json.rb
+++ b/www/secretary/workbench/views/actions/icla.json.rb
@@ -15,6 +15,10 @@ fileext = File.extname(@selected).downcase if 
@signature.empty?
 
 # verify that an ICLA under that name doesn't already exist
 if "#@filename#{fileext}" =~ /\w[-\w]*\.?\w*/
+  icladir = "#{ASF::SVN['iclas']}/#@filename" # also check for directory
+  if File.exist? icladir.untaint
+    _warn "documents/iclas/#@filename already exists"
+  end
   icla = "#{ASF::SVN['iclas']}/#@filename#{fileext}"
   if File.exist? icla.untaint
     _warn "documents/iclas/#@filename#{fileext} already exists"