admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Let commands decide what mode the installer should use

Browse Source
This commit is contained in:
Jack Nagel 2014-03-02 00:19:37 -06:00
parent ea85812c58
commit ffbe5bf22c
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/install.rb
View File

@ -104,6 +104,8 @@ module Homebrew extend self
def install_formula f def install_formula f
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.ignore_deps = ARGV.ignore_deps? || ARGV.interactive?
fi.only_deps = ARGV.only_deps?
fi.install fi.install
fi.caveats fi.caveats
fi.finish fi.finish

2
Library/Homebrew/cmd/upgrade.rb
View File

@ -65,6 +65,8 @@ module Homebrew extend self
installer = FormulaInstaller.new(f) installer = FormulaInstaller.new(f)
installer.options |= tab.used_options installer.options |= tab.used_options
installer.show_header = false installer.show_header = false
installer.ignore_deps = ARGV.ignore_deps?
fi.only_deps = ARGV.only_deps?
oh1 "Upgrading #{f.name}" oh1 "Upgrading #{f.name}"

5
Library/Homebrew/formula_installer.rb
View File

@ -22,8 +22,8 @@ class FormulaInstaller
def initialize ff def initialize ff
@f = ff @f = ff
@show_header = false @show_header = false
@ignore_deps = ARGV.ignore_deps? || ARGV.interactive? @ignore_deps = false
@only_deps = ARGV.only_deps? @only_deps = false
@options = Options.new @options = Options.new
@@attempted ||= Set.new @@attempted ||= Set.new
@ -296,7 +296,6 @@ class FormulaInstaller
fi.options |= dep.options fi.options |= dep.options
fi.options |= inherited_options fi.options |= inherited_options
fi.ignore_deps = true fi.ignore_deps = true
fi.only_deps = false
fi.show_header = false fi.show_header = false
oh1 "Installing #{f} dependency: #{Tty.green}#{df}#{Tty.reset}" oh1 "Installing #{f} dependency: #{Tty.green}#{df}#{Tty.reset}"
outdated_keg.unlink if outdated_keg outdated_keg.unlink if outdated_keg