[whimsy] branch master updated: possible fix for WHIMSY-338

2020-07-29 Thread rubys
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 ab3d53c  possible fix for WHIMSY-338
ab3d53c is described below

commit ab3d53cd9c77fdf7fe6860e8d6873b244e7d7901
Author: Sam Ruby 
AuthorDate: Wed Jul 29 17:54:42 2020 -0400

possible fix for WHIMSY-338
---
 www/secretary/workbench/views/actions/icla.json.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/secretary/workbench/views/actions/icla.json.rb 
b/www/secretary/workbench/views/actions/icla.json.rb
index c2a4057..7a02c0a 100644
--- a/www/secretary/workbench/views/actions/icla.json.rb
+++ b/www/secretary/workbench/views/actions/icla.json.rb
@@ -191,8 +191,8 @@ if @valid_user and @pmc and not @votelink.empty?
 
   rc = ASF::SVN.update(ASF::SVN.svnpath!('acreq', 'new-account-reqs.txt'),
 "#{@user} account request by #{env.user} for #{@pmc.name}",
-env, _, {diff: true}) do |input|
-  input +  + @acreq + "\n"
+env, _, {diff: true}) do |tmpdir, contents|
+  contents + @acreq + "\n"
   end
   raise RuntimeError.new("exit code: #{rc}") if rc != 0
 



[whimsy] branch master updated: possible fix for WHIMSY-338

2020-07-29 Thread rubys
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 ab3d53c  possible fix for WHIMSY-338
ab3d53c is described below

commit ab3d53cd9c77fdf7fe6860e8d6873b244e7d7901
Author: Sam Ruby 
AuthorDate: Wed Jul 29 17:54:42 2020 -0400

possible fix for WHIMSY-338
---
 www/secretary/workbench/views/actions/icla.json.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/secretary/workbench/views/actions/icla.json.rb 
b/www/secretary/workbench/views/actions/icla.json.rb
index c2a4057..7a02c0a 100644
--- a/www/secretary/workbench/views/actions/icla.json.rb
+++ b/www/secretary/workbench/views/actions/icla.json.rb
@@ -191,8 +191,8 @@ if @valid_user and @pmc and not @votelink.empty?
 
   rc = ASF::SVN.update(ASF::SVN.svnpath!('acreq', 'new-account-reqs.txt'),
 "#{@user} account request by #{env.user} for #{@pmc.name}",
-env, _, {diff: true}) do |input|
-  input +  + @acreq + "\n"
+env, _, {diff: true}) do |tmpdir, contents|
+  contents + @acreq + "\n"
   end
   raise RuntimeError.new("exit code: #{rc}") if rc != 0