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

FormulaInstaller: flush before closing writes.

Browse Source 
This seems to help the problem with `brew install -v` sometimes truncating output.

Closes Homebrew/homebrew#24666.
This commit is contained in:
Mike McQuaid 2013-11-26 16:28:18 +00:00
parent 435e293857
commit 3c3bd76528
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/build.rb
View File

@ -46,6 +46,7 @@ def main
rescue Exception => e rescue Exception => e
unless error_pipe.nil? unless error_pipe.nil?
e.continuation = nil if ARGV.debug? e.continuation = nil if ARGV.debug?
error_pipe.flush
Marshal.dump(e, error_pipe) Marshal.dump(e, error_pipe)
error_pipe.close error_pipe.close
exit! 1 exit! 1

2
Library/Homebrew/formula_installer.rb
View File

@ -371,6 +371,7 @@ class FormulaInstaller
read.close read.close
exec(*args) exec(*args)
rescue Exception => e rescue Exception => e
write.flush
Marshal.dump(e, write) Marshal.dump(e, write)
write.close write.close
exit! 1 exit! 1
@ -378,6 +379,7 @@ class FormulaInstaller
end end
ignore_interrupts(:quietly) do # the fork will receive the interrupt and marshall it back ignore_interrupts(:quietly) do # the fork will receive the interrupt and marshall it back
write.flush
write.close write.close
Process.wait Process.wait
data = read.read data = read.read