Avoid merging a dict and a AnsibleUnicode

This is the same fix we applied to v1.9 in PR #14565, however it does not fix #14678 completely ! The dictionaries are not being merged as tey are on v1.9.
9 years ago · f78caabeac
parent a2080ad364
commit f78caabeac
1 changed files with 1 additions and 1 deletions
--- 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: