diff options
| author | Jack Nagel | 2013-09-07 10:22:58 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-09-07 10:22:58 -0500 |
| commit | 771a28427cc241f957a030502b386d0fd9bfa5b7 (patch) | |
| tree | 45b6a5b4a66f4ec52c20aa3b02f382c317639dfc /Library | |
| parent | 8b2a8d0595ce87963f2aac44ff075f9189a1f5f0 (diff) | |
| download | brew-771a28427cc241f957a030502b386d0fd9bfa5b7.tar.bz2 | |
Use block-form of File.open and let Ruby do the cleanup
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula.rb | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index f01ca768a..15561b100 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -572,24 +572,25 @@ class Formula end wr.close - f = File.open(logfn, 'w') - f.write(rd.read) until rd.eof? - - Process.wait - - unless $?.success? - f.flush - Kernel.system "/usr/bin/tail", "-n", "5", logfn - f.puts - require 'cmd/--config' - Homebrew.write_build_config(f) - raise ErrorDuringExecution + File.open(logfn, 'w') do |f| + f.write(rd.read) until rd.eof? + + Process.wait + + unless $?.success? + f.flush + Kernel.system "/usr/bin/tail", "-n", "5", logfn + f.puts + require 'cmd/--config' + Homebrew.write_build_config(f) + raise ErrorDuringExecution + end end end rescue ErrorDuringExecution raise BuildError.new(self, cmd, args, $?) ensure - [rd, f].each { |io| io.close if io and not io.closed? } + rd.close if rd and not rd.closed? ENV.update(removed_ENV_variables) if removed_ENV_variables end |
