whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Use library methods
Date Mon, 29 Jun 2020 15:31:57 GMT
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 2fac3f6  Use library methods
2fac3f6 is described below

commit 2fac3f6f9694f464a771002d48ea380563af02a1
Author: Sebb <sebb@apache.org>
AuthorDate: Mon Jun 29 16:30:36 2020 +0100

    Use library methods
---
 www/board/agenda/models/agenda.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/board/agenda/models/agenda.rb b/www/board/agenda/models/agenda.rb
index 04a5a30..291fb45 100755
--- a/www/board/agenda/models/agenda.rb
+++ b/www/board/agenda/models/agenda.rb
@@ -158,11 +158,11 @@ class Agenda
 
       # check out empty directory
       board = ASF::SVN.getInfoItem(FOUNDATION_BOARD,'url')
-      _.system ['svn', 'checkout', auth, '--depth', 'empty', board, dir]
+      ASF::SVN.svn_!('checkout', [board, dir], _, {depth: 'empty', auth: auth})
 
       # update the file in question
       path = File.join(dir, file)
-      _.system ['svn', 'update', auth, path]
+      ASF::SVN.svn_!('update', path, _, {auth: auth})
 
       # invoke block, passing it the current contents of the file
       if block and message
@@ -172,7 +172,7 @@ class Agenda
         # if the output differs, update and commit the file in question
         if output != input
           IO.write(path, output)
-          commit_rc = _.system ['svn', 'commit', auth, path, '-m', message]
+          commit_rc = ASF::SVN.svn_('commit', path, _, {auth: auth, msg: message})
         end
       else
         output = IO.read(path)
@@ -197,6 +197,7 @@ class Agenda
           sleep rand(41-retries*2)*0.1 if retries <= 20
           update(file, message, retries-1, &block)
         else
+          Wunderbar.error _.target! # show the transcript
           raise Exception.new("svn commit failed")
         end
       end


Mime
View raw message