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
commit ff518b1c73e493c833da478e0b3c3ce5229e58b7 Author: Sebb <[email protected]> AuthorDate: Tue Nov 24 00:20:16 2020 +0000 Try to fix Travis OSX failure --- lib/whimsy/asf/svn.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb index 4fd7ed0..82f521c 100644 --- a/lib/whimsy/asf/svn.rb +++ b/lib/whimsy/asf/svn.rb @@ -697,6 +697,7 @@ module ASF temp = options[:tmpdir] tmpdir = temp ? temp : Dir.mktmpdir + rc = -1 # in case begin cmdfile = Tempfile.new('svnmucc_input', tmpdir) # add the commands @@ -739,18 +740,19 @@ module ASF _.system 'echo', [syscmd.flatten, sysopts.to_s] end if options[:dryrun] - _.system syscmd.insert(0, 'echo') + rc = _.system syscmd.insert(0, 'echo') else if _.instance_of?(Wunderbar::JsonBuilder) or _.instance_of?(Wunderbar::TextBuilder) - _.system syscmd, sysopts, sysopts # needs two hashes + rc = _.system syscmd, sysopts, sysopts # needs two hashes else - _.system syscmd, sysopts + rc = _.system syscmd, sysopts end end ensure File.delete cmdfile.path # always drop the command file FileUtils.rm_rf tmpdir unless temp end + rc end # DRAFT
