aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-03-29 17:47:42 -0500
committerJack Nagel2014-03-29 17:47:42 -0500
commitc8c85b4ac424a9da2ea426ae150c2e860f693ac4 (patch)
treeea47e1860d669d3935ed873ff1dd09aa5b6d2006 /Library
parenta7c220debfb740465f70d5c12a1e9ebeeacb6b7e (diff)
downloadbrew-c8c85b4ac424a9da2ea426ae150c2e860f693ac4.tar.bz2
Always call Process.wait with an argument
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula.rb4
-rw-r--r--Library/Homebrew/utils.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 9d6f525ba..81b546388 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -572,7 +572,7 @@ class Formula
logfn = "#{logd}/%02d.%s" % [@exec_count, File.basename(cmd).split(' ').first]
mkdir_p(logd)
- fork do
+ pid = fork do
ENV['HOMEBREW_CC_LOG_PATH'] = logfn
# TODO system "xcodebuild" is deprecated, this should be removed soon.
@@ -603,7 +603,7 @@ class Formula
puts buf if ARGV.verbose?
end
- Process.wait
+ Process.wait(pid)
$stdout.flush
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index 8fa86797f..ac84c1602 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -84,8 +84,8 @@ def interactive_shell f=nil
ENV['HOMEBREW_DEBUG_INSTALL'] = f.name
end
- fork {exec ENV['SHELL'] }
- Process.wait
+ Process.wait fork { exec ENV['SHELL'] }
+
unless $?.success?
puts "Aborting due to non-zero exit status"
exit $?