diff options
| author | Jack Nagel | 2014-03-02 00:19:37 -0600 |
|---|---|---|
| committer | Jack Nagel | 2014-03-02 00:21:13 -0600 |
| commit | 881a8855b944fa9bd7dfd598bb9197f79f7a13f0 (patch) | |
| tree | 49ddaac59f8c78e639e238518ec8969abbd00d76 /Library | |
| parent | 4f63fc566ecaa9ddcb3e59a7ac5755260a0511b1 (diff) | |
| download | homebrew-881a8855b944fa9bd7dfd598bb9197f79f7a13f0.tar.bz2 | |
Let commands decide what mode the installer should use
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index cd3c3c8d2..774a28472 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.install fi.caveats fi.finish diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index d222c5a98..f7eaa5185 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -65,6 +65,8 @@ module Homebrew extend self installer = FormulaInstaller.new(f) installer.options |= tab.used_options installer.show_header = false + installer.ignore_deps = ARGV.ignore_deps? + fi.only_deps = ARGV.only_deps? oh1 "Upgrading #{f.name}" diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 5b550fcdc..501c73b4a 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 @@ -296,7 +296,6 @@ 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 |