ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fixed caches (#30667)

Browse source
This commit is contained in:
Brian Coca 2017-10-19 14:23:22 -04:00 • committed by GitHub
parent 0b8e38d022
commit 2ffe3c42bb
7 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/plugins/inventory/script.py
View file

@ -72,7 +72,7 @@ class InventoryModule(BaseInventoryPlugin):
try:
cache_key = self.get_cache_prefix(path)
if not cache or cache_key not in inventory.cache:
if not cache or cache_key not in self._cache:
try:
sp = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
except OSError as e:
@ -93,11 +93,11 @@ class InventoryModule(BaseInventoryPlugin):
raise AnsibleError("Inventory {0} contained characters that cannot be interpreted as UTF-8: {1}".format(path, to_native(e)))
try:
inventory.cache[cache_key] = self.loader.load(data, file_name=path)
self._cache[cache_key] = self.loader.load(data, file_name=path)
except Exception as e:
raise AnsibleError("failed to parse executable inventory script results from {0}: {1}\n{2}".format(path, to_native(e), err))
processed = inventory.cache[cache_key]
processed = self._cache[cache_key]
if not isinstance(processed, Mapping):
raise AnsibleError("failed to parse executable inventory script results from {0}: needs to be a json dict\n{1}".format(path, err))