[whimsy] branch master updated: Use library routine

[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 eb85236  Use library routine
eb85236 is described below

commit eb8523621c301a9528081aac03b9fea01519ca2c
Author: Sebb <se...@apache.org>
AuthorDate: Sat Jun 13 16:59:55 2020 +0100

    Use library routine
---
 lib/whimsy/asf/svn.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index fc30956..ba130b8 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -608,10 +608,9 @@ module ASF
         end
 
         # fail if there are pending changes
-        status = `svn st #{tmpfile || tmpdir}`
-        # out, err = self.svn('status', tmpfile || tmpdir)
-        unless rc == 0 && status.empty?
-          raise "svn failure #{rc} #{path.inspect} #{status}"
+        out, err = self.svn('status', tmpfile || tmpdir) # Need to use svn rather than svn_ here
+        unless rc == 0 && out && out.empty?
+          raise "svn failure #{rc} #{path.inspect} #{out}"
         end
       ensure
         FileUtils.rm_rf tmpdir