From 865fb15ad7d51d2cae0632f1725020c8dc37b208 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Sun, 7 Feb 2021 22:26:06 +0100 Subject: [PATCH] on_os block: allow to contain conflicts_with Some conflicts are os-specific. --- Library/Homebrew/rubocops/components_order.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/rubocops/components_order.rb b/Library/Homebrew/rubocops/components_order.rb index 27e5a55e86..3f955d225b 100644 --- a/Library/Homebrew/rubocops/components_order.rb +++ b/Library/Homebrew/rubocops/components_order.rb @@ -110,7 +110,7 @@ module RuboCop end def check_on_os_block_content(component_precedence_list, on_os_block) - on_os_allowed_methods = %w[depends_on patch resource deprecate! disable!] + on_os_allowed_methods = %w[depends_on patch resource deprecate! disable! conflicts_with] _, offensive_node = check_order(component_precedence_list, on_os_block.body) component_problem(*offensive_node) if offensive_node child_nodes = on_os_block.body.begin_type? ? on_os_block.body.child_nodes : [on_os_block.body]