admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #10160 from MikeMcQuaid/exitstatus

Browse Source 
exceptions: fix ErrorDuringExecution status.
This commit is contained in:
Mike McQuaid 2020-12-28 10:15:57 +00:00 committed by GitHub
commit 4611266f08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/exceptions.rb
View File

@ -582,7 +582,7 @@ class ErrorDuringExecution < RuntimeError
when Integer when Integer
status status
else else
status.exitstatus status&.exitstatus
end end
redacted_cmd = redact_secrets(cmd.shelljoin.gsub('\=', "="), secrets) redacted_cmd = redact_secrets(cmd.shelljoin.gsub('\=', "="), secrets)
@ -592,7 +592,7 @@ class ErrorDuringExecution < RuntimeError
elsif (uncaught_signal = status.termsig) elsif (uncaught_signal = status.termsig)
"was terminated by uncaught signal #{Signal.signame(uncaught_signal)}" "was terminated by uncaught signal #{Signal.signame(uncaught_signal)}"
else else
raise ArgumentError, "Status does neither have `exitstatus` nor `termsig`." raise ArgumentError, "Status neither has `exitstatus` nor `termsig`."
end end
s = +"Failure while executing; `#{redacted_cmd}` #{reason}." s = +"Failure while executing; `#{redacted_cmd}` #{reason}."