internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14679 from dagwieers/merge_hash_v2

Browse Source 
Avoid merging a dict and a AnsibleUnicode
This commit is contained in:
James Cammarata
2016-03-19 12:58:42 -04:00
parent eafeab4ab5 0eca47cf91
commit e4a5bcae3c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/utils/vars.py
View File

@@ -86,7 +86,7 @@ def merge_hash(a, b):
for k, v in iteritems(b):
# if there's already such key in a
# and that key contains a MutableMapping
if k in result and isinstance(result[k], MutableMapping):
if k in result and isinstance(result[k], MutableMapping) and isinstance(v, MutableMapping):
# merge those dicts recursively
result[k] = merge_hash(result[k], v)
else: