diff options
| author | James Cammarata <jimi@sngx.net> | 2016-03-19 12:58:42 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2016-03-19 12:58:42 -0400 |
| commit | e4a5bcae3c8c3b69ab832021bcc0cd77f9468b6c (patch) | |
| tree | 09af38aaf32258b5d135c0e94f30e4a4c9f69725 | |
| parent | eafeab4ab5be48e458f3a7b8589be4e963857746 (diff) | |
| parent | 0eca47cf91adc487af5250039381f9b468bbb258 (diff) | |
| download | ansible-e4a5bcae3c8c3b69ab832021bcc0cd77f9468b6c.tar.gz | |
Merge pull request #14679 from dagwieers/merge_hash_v2
Avoid merging a dict and a AnsibleUnicode
| -rw-r--r-- | lib/ansible/utils/vars.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/utils/vars.py b/lib/ansible/utils/vars.py index 73ba52b4b3..01eb5ac821 100644 --- a/lib/ansible/utils/vars.py +++ b/lib/ansible/utils/vars.py @@ -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: |