diff options
| author | Jack Nagel | 2013-01-23 00:26:27 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-01-26 12:14:46 -0600 |
| commit | 5822aa80cf685d989ff1f84d91cf20e1fca1dfbc (patch) | |
| tree | ab4fe3708443ef34e34199f2c982712de766c25b | |
| parent | 55681ca2019a5d52dc4982c64f65fca5a4bc974d (diff) | |
| download | brew-5822aa80cf685d989ff1f84d91cf20e1fca1dfbc.tar.bz2 | |
FormulaInstaller: make tab an attr, but never a parameter
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 6d477d6a8..026494d98 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -60,7 +60,8 @@ module Homebrew extend self tab = (f.opt_prefix.exist? ? Tab.for_keg(f.opt_prefix) : Tab.dummy_tab(f)) outdated_keg = Keg.new(f.linked_keg.realpath) rescue nil - installer = FormulaInstaller.new(f, tab) + installer = FormulaInstaller.new(f) + installer.tab = tab installer.show_header = false installer.install_bottle = (install_bottle?(f) and tab.used_options.empty?) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index b24641e55..9516af650 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -7,15 +7,14 @@ require 'caveats' class FormulaInstaller attr :f - attr :tab + attr :tab, true attr :show_summary_heading, true attr :ignore_deps, true attr :install_bottle, true attr :show_header, true - def initialize ff, tab=nil + def initialize ff @f = ff - @tab = tab @show_header = false @ignore_deps = ARGV.ignore_deps? || ARGV.interactive? @install_bottle = install_bottle? ff @@ -170,9 +169,11 @@ class FormulaInstaller def install_dependency dep dep_tab = Tab.for_formula(dep) dep = dep.to_formula + outdated_keg = Keg.new(dep.linked_keg.realpath) rescue nil - fi = FormulaInstaller.new(dep, dep_tab) + fi = FormulaInstaller.new(dep) + fi.tab = dep_tab fi.ignore_deps = true fi.show_header = false oh1 "Installing #{f} dependency: #{Tty.green}#{dep}#{Tty.reset}" |