From cd6652efec19df807335b30d73d87d5d6cc6b24a Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Tue, 4 Mar 2014 14:06:25 -0600
Subject: Let commands decide what mode the installer should use

---
 Library/Homebrew/cmd/install.rb       | 2 ++
 Library/Homebrew/cmd/upgrade.rb       | 1 +
 Library/Homebrew/formula_installer.rb | 5 ++---
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index bd90e9cc3..64de95ba2 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -104,6 +104,8 @@ 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.prelude
     fi.install
     fi.caveats
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 02cb85170..46d7b7aee 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -59,6 +59,7 @@ module Homebrew extend self
     installer = FormulaInstaller.new(f)
     installer.options |= Tab.for_formula(f).used_options
     installer.show_header = false
+    installer.ignore_deps = false
     installer.prelude
 
     oh1 "Upgrading #{f.name}"
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 241afa517..02a753bd5 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 = ARGV.ignore_deps? || ARGV.interactive?
-    @only_deps = ARGV.only_deps?
+    @ignore_deps = false
+    @only_deps = false
     @options = Options.new
 
     @@attempted ||= Set.new
@@ -311,7 +311,6 @@ class FormulaInstaller
     fi.options |= dep.options
     fi.options |= inherited_options
     fi.ignore_deps = true
-    fi.only_deps = false
     fi.show_header = false
     fi.prelude
     oh1 "Installing #{f} dependency: #{Tty.green}#{dep.name}#{Tty.reset}"
-- 
cgit v1.2.3