Merge pull request #835 from ilovezfs/install_deps_of_dep_before_dep

formula_installer: install deps of dep before dep

1 files changed, 6 insertions, 2 deletions

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index a1fd5ba0e..cf595cf71 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