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

Prevent error pipe object from being finalized

Browse Source 
When the first error pipe object is finalized, the underlying file
descriptor is closed, breaking the pipe between the build script and the
main Homebrew process. Keep a reference to this object so it isn't
closed.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jeff Clites 2012-07-03 15:32:36 -07:00 committed by Jack Nagel
parent ec39148c04
commit c2f05cfb71
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/build.rb
View File

@ -10,6 +10,8 @@ at_exit do
# the whole of everything must be run in at_exit because the formula has to
# be the run script as __END__ must work for *that* formula.
error_pipe = nil
begin
raise $! if $! # an exception was already thrown when parsing the formula
@ -35,15 +37,15 @@ at_exit do
# question altogether.
if ENV['HOMEBREW_ERROR_PIPE']
require 'fcntl'
IO.new(ENV['HOMEBREW_ERROR_PIPE'].to_i, 'w').fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
error_pipe = IO.new(ENV['HOMEBREW_ERROR_PIPE'].to_i, 'w')
error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
end
install(Formula.factory($0))
rescue Exception => e
if ENV['HOMEBREW_ERROR_PIPE']
pipe = IO.new(ENV['HOMEBREW_ERROR_PIPE'].to_i, 'w')
Marshal.dump(e, pipe)
pipe.close
unless error_pipe.nil?
Marshal.dump(e, error_pipe)
error_pipe.close
exit! 1
else
onoe e