wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit e4a5bcae3c
1 changed files with 1 additions and 1 deletions
Show stats 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): for k, v in iteritems(b):
# if there's already such key in a # if there's already such key in a
# and that key contains a MutableMapping # 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 # merge those dicts recursively
result[k] = merge_hash(result[k], v) result[k] = merge_hash(result[k], v)
else: else: