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.
This commit is contained in:
Jack Nagel 2014-03-02 09:00:40 -06:00
parent 79caaf5112
commit c534b1907d
3 changed files with 3 additions and 6 deletions

View File

@ -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

View File

@ -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}"

View File

@ -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