cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixes error in dict_merge when merging list value (#35461)

Browse source
This commit is contained in:
Peter Sprygada 2018-01-29 21:45:35 -05:00 committed by GitHub
parent 359ff19484
commit 2f7d207d7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/network/common/utils.py
View file

@ -284,7 +284,11 @@ def dict_merge(base, other):
if key in other:
item = other.get(key)
if item is not None:
combined[key] = list(set(chain(value, item)))
try:
combined[key] = list(set(chain(value, item)))
except TypeError:
value.extend([i for i in item if i not in value])
combined[key] = value
else:
combined[key] = item
else: