From 77a1c6f1661b188b5f2acaca0db1bbf4eb7c6262 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 27 Dec 2014 14:26:56 -0500 Subject: [PATCH] One less external call to #active_spec --- Library/Homebrew/formula.rb | 4 ++++ Library/Homebrew/formula_installer.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index cc25c2482c..2f25a5c304 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -212,6 +212,10 @@ class Formula active_spec.deprecated_options end + def deprecated_flags + active_spec.deprecated_flags + end + # If a named option is defined for the currently active {SoftwareSpec}. def option_defined?(name) active_spec.option_defined?(name) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 7cca750764..3515c66de3 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -154,7 +154,7 @@ class FormulaInstaller raise "Unrecognized architecture for --bottle-arch: #{arch}" end - formula.active_spec.deprecated_flags.each do |deprecated_option| + formula.deprecated_flags.each do |deprecated_option| old_flag = deprecated_option.old_flag new_flag = deprecated_option.current_flag opoo "#{formula.name}: #{old_flag} was deprecated; using #{new_flag} instead!"