From 6217e5200e8c2795691f171ea853475d7624e52b Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Thu, 1 Sep 2016 03:51:05 -0700 Subject: [PATCH] formula_installer: install deps of dep before dep Dependencies/requirements of a dependency need to be installed/satisfied before the dependency. The fact that @pour_failed may be false is irrelevant to that imperative if we weren't pouring to begin with, so this commit now checks for that case as well. --- Library/Homebrew/formula_installer.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index a1fd5ba0e9..cf595cf71f 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -219,7 +219,8 @@ class FormulaInstaller @@attempted << formula - if pour_bottle?(:warn => true) + pour_bottle = pour_bottle?(:warn => true) + if pour_bottle begin install_relocation_tools unless formula.bottle_specification.skip_relocation? pour @@ -242,7 +243,10 @@ class FormulaInstaller build_bottle_preinstall if build_bottle? unless @poured_bottle - compute_and_install_dependencies if @pour_failed && !ignore_deps? + not_pouring = !pour_bottle || @pour_failed + if not_pouring && !ignore_deps? + compute_and_install_dependencies + end build clean end