Don't double proxy unsafe variables

Potential fix for #12260

Don't double proxy unsafe variables
Potential fix for #12260
1eb5b427 · James Cammarata · dc945b80 · 1eb5b427
Commit 1eb5b427 authored Sep 08, 2015 by James Cammarata
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

lib/ansible/vars/__init__.py
+2 -1

No files found.
--- a/lib/ansible/vars/__init__.py
+++ b/lib/ansible/vars/__init__.py
@@ -183,7 +183,8 @@ class VariableManager:
            try:
                host_facts = self._fact_cache.get(host.name, dict())
                for k in host_facts.keys():
-                    host_facts[k] = UnsafeProxy(host_facts[k])
+                    if not isinstance(host_facts[k], UnsafeProxy):
+                        host_facts[k] = UnsafeProxy(host_facts[k])
                all_vars = combine_vars(all_vars, host_facts)
            except KeyError:
                pass