aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Steedman2016-11-12 12:03:04 +0000
committerBruce Steedman2016-11-12 12:03:04 +0000
commit098974b2a12d48dd00f1ef77300d816fd867f259 (patch)
treedd117c5de25c973bbd5b50e335e2936f6d04de98
parentbbea4ac87123c8565d350d11bfae79de105c493c (diff)
downloadbrew-098974b2a12d48dd00f1ef77300d816fd867f259.tar.bz2
@MikeMcQuaid requested changes
-rw-r--r--Library/Homebrew/build_options.rb1
-rw-r--r--Library/Homebrew/formula_installer.rb8
2 files changed, 5 insertions, 4 deletions
diff --git a/Library/Homebrew/build_options.rb b/Library/Homebrew/build_options.rb
index 1c44af147..edcae01f5 100644
--- a/Library/Homebrew/build_options.rb
+++ b/Library/Homebrew/build_options.rb
@@ -106,6 +106,7 @@ class BuildOptions
@args - @options
end
+ # @private
def invalid_option_names
invalid_options.map(&:flag).sort
end
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index f678acaf8..15c1c332f 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -32,7 +32,7 @@ class FormulaInstaller
end
attr_reader :formula
- attr_accessor :options, :build_bottle, :invalid_opt_names
+ attr_accessor :options, :build_bottle, :invalid_option_names
mode_attr_accessor :show_summary_heading, :show_header
mode_attr_accessor :build_from_source, :force_bottle
mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git
@@ -52,7 +52,7 @@ class FormulaInstaller
@quieter = false
@debug = false
@options = Options.new
- @invalid_opt_names = []
+ @invalid_option_names = []
@@attempted ||= Set.new
@@ -215,8 +215,8 @@ class FormulaInstaller
opoo "#{formula.full_name}: #{old_flag} was deprecated; using #{new_flag} instead!"
end
- invalid_opt_names.each do |option|
- opoo "#{formula.full_name}: #{option} is invalid for this formula and will be ignored!"
+ invalid_option_names.each do |option|
+ opoo "#{formula.full_name}: this formula has no #{option} option so it will be ignored!"
end
oh1 "Installing #{Formatter.identifier(formula.full_name)}" if show_header?