Extract compute_and_install_dependencies

1 files changed, 8 insertions, 9 deletions

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 5f43919c7..4aa66f407 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -102,11 +102,7 @@ class FormulaInstaller
 
     check_conflicts
 
-    unless ignore_deps
-      perform_readline_hack
-      check_requirements
-      install_dependencies
-    end
+    compute_and_install_dependencies unless ignore_deps
 
     if ARGV.build_bottle? && (arch = ARGV.bottle_arch) && !Hardware::CPU.optimization_flags.include?(arch)
       raise "Unrecognized architecture for --bottle-arch: #{arch}"
@@ -141,10 +137,7 @@ class FormulaInstaller
     build_bottle_preinstall if ARGV.build_bottle?
 
     unless @poured_bottle
-      if @pour_failed and not ignore_deps
-        check_requirements
-        install_dependencies
-      end
+      compute_and_install_dependencies if @pour_failed and not ignore_deps
       build
       clean
     end
@@ -179,6 +172,12 @@ class FormulaInstaller
     raise FormulaConflictError.new(f, conflicts) unless conflicts.empty?
   end
 
+  def compute_and_install_dependencies
+    perform_readline_hack
+    check_requirements
+    install_dependencies
+  end
+
   def check_requirements
     unsatisfied = ARGV.filter_for_dependencies do
       f.recursive_requirements do |dependent, req|