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

FormulaInstaller: initialize @tab

Browse Source
This commit is contained in:
Jack Nagel 2013-04-05 22:00:36 -05:00
parent e0d6ee863f
commit 6eac9679c0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/formula_installer.rb
View File

@ -17,6 +17,7 @@ class FormulaInstaller
@show_header = false @show_header = false
@ignore_deps = ARGV.ignore_deps? || ARGV.interactive? @ignore_deps = ARGV.ignore_deps? || ARGV.interactive?
@options = Options.new @options = Options.new
@tab = Tab.dummy_tab(ff)
@@attempted ||= Set.new @@attempted ||= Set.new
@ -25,7 +26,7 @@ class FormulaInstaller
end end
def pour_bottle? warn=false def pour_bottle? warn=false
(tab.used_options.empty? rescue true) && options.empty? && install_bottle?(f, warn) tab.used_options.empty? && options.empty? && install_bottle?(f, warn)
end end
def check_install_sanity def check_install_sanity
@ -267,7 +268,7 @@ class FormulaInstaller
opts = Options.coerce(ARGV.options_only) opts = Options.coerce(ARGV.options_only)
unless opts.include? '--fresh' unless opts.include? '--fresh'
opts.concat(options) # from a dependent formula opts.concat(options) # from a dependent formula
opts.concat((tab.used_options rescue [])) # from a previous install opts.concat(tab.used_options) # from a previous install
end end
opts << Option.new("--build-from-source") # don't download bottle opts << Option.new("--build-from-source") # don't download bottle
end end