From 681098f4fe05dac644f2fbc1a8d267dd8468e025 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Wed, 1 Aug 2018 06:25:31 +0200 Subject: [PATCH] Fix `ErrorDuringExecution` initialization. --- Library/Homebrew/utils/popen.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/utils/popen.rb b/Library/Homebrew/utils/popen.rb index 6a7addcd5d..8c7adff27a 100644 --- a/Library/Homebrew/utils/popen.rb +++ b/Library/Homebrew/utils/popen.rb @@ -5,8 +5,8 @@ module Utils def self.safe_popen_read(*args, **options, &block) output = popen_read(*args, **options, &block) - raise ErrorDuringExecution(args, stdout: output, status: $CHILD_STATUS) unless $CHILD_STATUS.success? - output + return output if $CHILD_STATUS.success? + raise ErrorDuringExecution.new(args, status: $CHILD_STATUS, output: [[:stdout, output]]) end def self.popen_write(*args, **options, &block) @@ -15,8 +15,8 @@ module Utils def self.safe_popen_write(*args, **options, &block) output = popen_write(*args, **options, &block) - raise ErrorDuringExecution(args, stdout: output, status: $CHILD_STATUS) unless $CHILD_STATUS.success? - output + return output if $CHILD_STATUS.success? + raise ErrorDuringExecution.new(args, status: $CHILD_STATUS, output: [[:stdout, output]]) end def self.popen(args, mode, options = {})