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

Always call Process.wait with an argument

Browse Source
This commit is contained in:
Jack Nagel 2014-03-29 17:47:42 -05:00
parent a7c220debf
commit c8c85b4ac4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula.rb
View File

@ -572,7 +572,7 @@ class Formula
logfn = "#{logd}/%02d.%s" % [@exec_count, File.basename(cmd).split(' ').first] logfn = "#{logd}/%02d.%s" % [@exec_count, File.basename(cmd).split(' ').first]
mkdir_p(logd) mkdir_p(logd)
fork do pid = fork do
ENV['HOMEBREW_CC_LOG_PATH'] = logfn ENV['HOMEBREW_CC_LOG_PATH'] = logfn
# TODO system "xcodebuild" is deprecated, this should be removed soon. # TODO system "xcodebuild" is deprecated, this should be removed soon.
@ -603,7 +603,7 @@ class Formula
puts buf if ARGV.verbose? puts buf if ARGV.verbose?
end end
Process.wait Process.wait(pid)
$stdout.flush $stdout.flush

4
Library/Homebrew/utils.rb
View File

@ -84,8 +84,8 @@ def interactive_shell f=nil
ENV['HOMEBREW_DEBUG_INSTALL'] = f.name ENV['HOMEBREW_DEBUG_INSTALL'] = f.name
end end
fork {exec ENV['SHELL'] } Process.wait fork { exec ENV['SHELL'] }
Process.wait
unless $?.success? unless $?.success?
puts "Aborting due to non-zero exit status" puts "Aborting due to non-zero exit status"
exit $? exit $?