From c534b1907d10f57220d7f13a791c38c35854b32c Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sun, 2 Mar 2014 09:00:40 -0600
Subject: [PATCH] Revert "Let commands decide what mode the installer should
 use"

I'd still like to make this change, but at least for now the initializer
requires ignore_deps to be set correctly.

This reverts commit 881a8855b944fa9bd7dfd598bb9197f79f7a13f0.
---
 Library/Homebrew/cmd/install.rb       | 2 --
 Library/Homebrew/cmd/upgrade.rb       | 2 --
 Library/Homebrew/formula_installer.rb | 5 +++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 774a284724..cd3c3c8d25 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -104,8 +104,6 @@ module Homebrew extend self
 
   def install_formula f
     fi = FormulaInstaller.new(f)
-    fi.ignore_deps = ARGV.ignore_deps? || ARGV.interactive?
-    fi.only_deps = ARGV.only_deps?
     fi.install
     fi.caveats
     fi.finish
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index cf30996039..d222c5a986 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -65,8 +65,6 @@ module Homebrew extend self
     installer = FormulaInstaller.new(f)
     installer.options |= tab.used_options
     installer.show_header = false
-    installer.ignore_deps = ARGV.ignore_deps?
-    installer.only_deps = ARGV.only_deps?
 
     oh1 "Upgrading #{f.name}"
 
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 501c73b4a4..5b550fcdc7 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -22,8 +22,8 @@ class FormulaInstaller
   def initialize ff
     @f = ff
     @show_header = false
-    @ignore_deps = false
-    @only_deps = false
+    @ignore_deps = ARGV.ignore_deps? || ARGV.interactive?
+    @only_deps = ARGV.only_deps?
     @options = Options.new
 
     @@attempted ||= Set.new
@@ -296,6 +296,7 @@ class FormulaInstaller
     fi.options |= dep.options
     fi.options |= inherited_options
     fi.ignore_deps = true
+    fi.only_deps = false
     fi.show_header = false
     oh1 "Installing #{f} dependency: #{Tty.green}#{df}#{Tty.reset}"
     outdated_keg.unlink if outdated_keg