internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

More template unit tests for v2

Browse Source
This commit is contained in:
James Cammarata
2015-05-17 01:06:02 -05:00
parent 23cd3294d0
commit 9aa8676bdd
4 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ansible/plugins/lookup/file.py
View File

@@ -42,18 +42,22 @@ class LookupModule(LookupBase):
# role/files/ directory, and finally the playbook directory
# itself (which will be relative to the current working dir)
if 'role_path' in variables:
relative_path = self._loader.path_dwim_relative(variables['role_path'], 'files', term, check=False)
# FIXME: the original file stuff still needs to be worked out, but the
# playbook_dir stuff should be able to be removed as it should
# be covered by the fact that the loader contains that info
#if '_original_file' in variables:
# relative_path = self._loader.path_dwim_relative(variables['_original_file'], 'files', term, self.basedir, check=False)
#if 'playbook_dir' in variables:
# playbook_path = os.path.join(variables['playbook_dir'], term)
for path in (basedir_path, relative_path, playbook_path):
if path and os.path.exists(path):
ret.append(codecs.open(path, encoding="utf8").read().rstrip())
try:
contents = self._loader._get_file_contents(path)
ret.append(contents.rstrip())
break
except AnsibleParserError:
continue
else:
raise AnsibleError("could not locate file in lookup: %s" % term)