From 85feea33c003748740f3a3dc1e410549afa50e95 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 22 Feb 2014 21:39:38 -0500 Subject: [PATCH] Hoist assignment to simplify a conditional --- Library/Homebrew/formula.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 15b9734fc9..e48d21a2ce 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -548,6 +548,7 @@ class Formula # Throws if there's an error def system cmd, *args removed_ENV_variables = {} + rd, wr = IO.pipe # remove "boring" arguments so that the important ones are more likely to # be shown considering that we trim long ohai lines to the terminal width @@ -568,7 +569,6 @@ class Formula logfn = "#{logd}/%02d.%s" % [@exec_count, File.basename(cmd).split(' ').first] mkdir_p(logd) - rd, wr = IO.pipe fork do ENV['HOMEBREW_CC_LOG_PATH'] = logfn rd.close @@ -601,7 +601,7 @@ class Formula end end ensure - rd.close if rd and not rd.closed? + rd.close unless rd.closed? ENV.update(removed_ENV_variables) end