ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-05 05:34:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Only combine vars in include_vars if both are mappings

Browse source 
Fixes #15184
This commit is contained in:
James Cammarata 2016-03-30 11:10:54 -04:00
commit 4fc0aadd84
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/vars/__init__.py
View file

@ -605,7 +605,7 @@ class VariableManager:
host_name = host.get_name() host_name = host.get_name()
if host_name not in self._vars_cache: if host_name not in self._vars_cache:
self._vars_cache[host_name] = dict() self._vars_cache[host_name] = dict()
if varname in self._vars_cache[host_name]: if varname in self._vars_cache[host_name] and isinstance(self._vars_cache[host_name][varname], MutableMapping) and isinstance(value, MutableMapping):
self._vars_cache[host_name][varname] = combine_vars(self._vars_cache[host_name][varname], value) self._vars_cache[host_name][varname] = combine_vars(self._vars_cache[host_name][varname], value)
else: else:
self._vars_cache[host_name][varname] = value self._vars_cache[host_name][varname] = value