[whimsy] branch master updated: Use path array instead of args:

[se...@apache.org]

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 4680775  Use path array instead of args:
4680775 is described below

commit 46807756191670843508e8b293550bcd708d98fd
Author: Sebb <se...@apache.org>
AuthorDate: Tue Jun 9 23:32:44 2020 +0100

    Use path array instead of args:
---
 lib/whimsy/asf/svn.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index 5f766b0..52e3b65 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -456,8 +456,8 @@ module ASF
         user = env.user.dup.untaint
         pass = env.password.dup.untaint
         # checkout committers/board (this does not have many files currently)
-        out, err = self.svn('checkout', ciURL,
-          {args: [tmpdir.untaint, '--quiet', '--depth', 'files'],
+        out, err = self.svn('checkout', [ciURL, tmpdir.untaint],
+          {args: ['--quiet', '--depth', 'files'],
            user: user, password: pass})
 
         raise Exception.new("Checkout of board folder failed: #{err}") unless out
@@ -472,8 +472,8 @@ module ASF
         File.write(file, info)
 
         # commit the updated file
-        out, err = self.svn('commit', file,
-          {args: [tmpdir.untaint,'--quiet', '--message', msg],
+        out, err = self.svn('commit', [file, tmpdir.untaint],
+          {args: ['--quiet', '--message', msg],
            user: user, password: pass})
 
         raise Exception.new("Update of committee-info.txt failed: #{err}") unless out
@@ -503,8 +503,8 @@ module ASF
       # N.B. the extra enclosing [] tell _.system not to show their contents on error
       begin
         # create an empty checkout
-        self.svn_('checkout', self.getInfoItem(dir,'url'), _,
-          {args: ['--depth', 'empty', tmpdir], env: env})
+        self.svn_('checkout', [self.getInfoItem(dir,'url'), tmpdir], _,
+          {args: ['--depth', 'empty'], env: env})
 
         # retrieve the file to be updated (may not exist)
         if basename
@@ -658,7 +658,7 @@ module ASF
       begin
 
         # create an empty checkout
-        rc = self.svn_('checkout', parenturl, _, {args: ['--depth', 'empty', tmpdir], env: env})
+        rc = self.svn_('checkout', [parenturl, tmpdir], _, {args: ['--depth', 'empty'], env: env})
         raise "svn failure #{rc} checkout #{parenturl}" unless rc == 0
 
         # checkout the file