From 440fb185dd6f702bce85691c6fda4cc50876b47d Mon Sep 17 00:00:00 2001 From: Ben Muschol Date: Fri, 15 Feb 2019 01:16:07 -0500 Subject: [PATCH] Fix 1 style conflict, keep the other for consistency --- Library/Homebrew/cli_parser.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/cli_parser.rb b/Library/Homebrew/cli_parser.rb index d18811ef94..c8616dbc4a 100644 --- a/Library/Homebrew/cli_parser.rb +++ b/Library/Homebrew/cli_parser.rb @@ -237,13 +237,9 @@ module Homebrew @switch_sources[option_to_name(option)] == :env_var end - if violations.count - env_var_options.count == 1 - env_var_options.each do |option| - disable_switch option - end - else - raise OptionConflictError, violations.map(&method(:name_to_option)) - end + select_cli_arg = violations.count - env_var_options.count == 1 + raise OptionConflictError, violations.map(&method(:name_to_option)) unless select_cli_arg + env_var_options.each(&method(:disable_switch)) end end