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

Totally rework the way UnsafeProxy does things

Browse Source
This commit is contained in:
James Cammarata
2015-10-12 17:05:22 -04:00
parent 723dcba486
commit cd2cb178ae
2 changed files with 23 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/vars/__init__.py
View File

@@ -44,7 +44,7 @@ from ansible.utils.debug import debug
from ansible.utils.listify import listify_lookup_plugin_terms
from ansible.utils.vars import combine_vars
from ansible.vars.hostvars import HostVars
from ansible.vars.unsafe_proxy import UnsafeProxy
from ansible.vars.unsafe_proxy import wrap_var
VARIABLE_CACHE = dict()
HOSTVARS_CACHE = dict()
@@ -243,10 +243,7 @@ class VariableManager:
# finally, the facts caches for this host, if it exists
try:
host_facts = self._fact_cache.get(host.name, dict())
for k in host_facts.keys():
if host_facts[k] is not None and not isinstance(host_facts[k], UnsafeProxy):
host_facts[k] = UnsafeProxy(host_facts[k])
host_facts = wrap_var(self._fact_cache.get(host.name, dict()))
all_vars = combine_vars(all_vars, host_facts)
except KeyError:
pass