#79293: lib/ansible/utils/vars.py - def merge_hash - syntax change

pull/79312/head
awilk00 2 years ago
parent 70bf94bdb8
commit 6401f65640

@ -108,7 +108,7 @@ def merge_hash(x, y, recursive=True, list_merge='replace'):
# list_merge != append and list_merge != prepend), return y
# (this `if` can be remove without impact on the function
# except performance)
if x == {} or (x == y and list_merge != 'append' and list_merge != 'prepend'):
if x == {} or (x == y and list_merge not in ('append', 'prepend')):
return y.copy()
# in the following we will copy elements from y to x, but

Loading…
Cancel
Save