diff options
| author | Jack Nagel | 2014-03-29 17:47:42 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-03-29 17:47:42 -0500 |
| commit | b509defa1da15af7c563dbdb8e6fdd92197bd507 (patch) | |
| tree | ac8945cac7248a2b3f00e765ad996bf366a1ee8b /Library | |
| parent | 4688c1614f152b9915059b5513a9a8f1c4ff450b (diff) | |
| download | homebrew-b509defa1da15af7c563dbdb8e6fdd92197bd507.tar.bz2 | |
Always call Process.wait with an argument
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/utils.rb | 4 |
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 $? |
