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

Fix 1 style conflict, keep the other for consistency

Browse Source
This commit is contained in:
Ben Muschol 2019-02-15 01:16:07 -05:00
parent f8d84249aa
commit 440fb185dd
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cli_parser.rb
View File

@ -237,13 +237,9 @@ module Homebrew
@switch_sources[option_to_name(option)] == :env_var @switch_sources[option_to_name(option)] == :env_var
end end
if violations.count - env_var_options.count == 1 select_cli_arg = violations.count - env_var_options.count == 1
env_var_options.each do |option| raise OptionConflictError, violations.map(&method(:name_to_option)) unless select_cli_arg
disable_switch option env_var_options.each(&method(:disable_switch))
end
else
raise OptionConflictError, violations.map(&method(:name_to_option))
end
end end
end end