From 8830e401a9332abd6d75261a7116851a2a9c135b Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Fri, 4 Sep 2015 21:27:46 +0800 Subject: [PATCH] formula_installer: check has_apple_developer_tools? once Closes Homebrew/homebrew#43534. Signed-off-by: Xu Cheng --- Library/Homebrew/formula_installer.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 72ae9a87e0..c997176f91 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -162,7 +162,7 @@ class FormulaInstaller unless ignore_deps? deps = compute_dependencies - check_dependencies_bottled(deps) if pour_bottle? + check_dependencies_bottled(deps) if pour_bottle? && !MacOS.has_apple_developer_tools? install_dependencies(deps) end @@ -248,10 +248,7 @@ class FormulaInstaller # abnormally with a BuildToolsError if one or more don't. # Only invoked when the user has no developer tools. def check_dependencies_bottled(deps) - unbottled = deps.select do |dep, _| - formula = dep.to_formula - !formula.pour_bottle? && !MacOS.has_apple_developer_tools? - end + unbottled = deps.reject { |dep, _| dep.to_formula.pour_bottle? } raise BuildToolsError.new(unbottled) unless unbottled.empty? end