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

Merge pull request #10561 from iMichka/conflicts

Browse Source 
on_os block: allow to contain conflicts_with
This commit is contained in:
Dawid Dziurla 2021-02-08 16:42:03 +01:00 committed by GitHub
commit c5e3437122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/rubocops/components_order.rb
View File

@ -110,7 +110,7 @@ module RuboCop
end end
def check_on_os_block_content(component_precedence_list, on_os_block) 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) _, offensive_node = check_order(component_precedence_list, on_os_block.body)
component_problem(*offensive_node) if offensive_node 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] child_nodes = on_os_block.body.begin_type? ? on_os_block.body.child_nodes : [on_os_block.body]