diff options
| -rw-r--r-- | Library/Homebrew/cmd/leaves.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/reinstall.rb | 5 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/Library/Homebrew/cmd/leaves.rb b/Library/Homebrew/cmd/leaves.rb index 06f81d92d..37e379d49 100644 --- a/Library/Homebrew/cmd/leaves.rb +++ b/Library/Homebrew/cmd/leaves.rb @@ -12,11 +12,10 @@ module Homebrew installed.each do |f| deps = [] - tab = Tab.for_formula(f) f.deps.each do |dep| if dep.optional? || dep.recommended? - deps << dep.to_formula.full_name if tab.with?(dep) + deps << dep.to_formula.full_name if f.build.with?(dep) else deps << dep.to_formula.full_name end diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb index dc3a02cef..b1cf3396c 100644 --- a/Library/Homebrew/cmd/reinstall.rb +++ b/Library/Homebrew/cmd/reinstall.rb @@ -11,8 +11,7 @@ module Homebrew end def reinstall_formula(f) - tab = Tab.for_formula(f) - options = tab.used_options | f.build.used_options + options = f.build.used_options notice = "Reinstalling #{f.full_name}" notice += " with #{options * ", "}" unless options.empty? @@ -25,7 +24,7 @@ module Homebrew fi = FormulaInstaller.new(f) fi.options = options - fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && tab.build_bottle?) + fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?) fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source? fi.force_bottle = ARGV.force_bottle? fi.interactive = ARGV.interactive? diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index e914da3a3..d2e251783 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -66,11 +66,10 @@ module Homebrew def upgrade_formula(f) outdated_keg = Keg.new(f.linked_keg.resolved_path) if f.linked_keg.directory? - tab = Tab.for_formula(f) fi = FormulaInstaller.new(f) - fi.options = tab.used_options - fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && tab.build_bottle?) + fi.options = f.build.used_options + fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?) fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source? fi.verbose = ARGV.verbose? fi.quieter = ARGV.quieter? |