cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed redundant string check

Browse source 
added playbook path lookup
This commit is contained in:
Brian Coca 2015-06-10 22:58:08 -04:00
parent 7306a5397e
commit 40336b50af
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/plugins/lookup/file.py
View file

@ -27,9 +27,6 @@ class LookupModule(LookupBase):
def run(self, terms, variables=None, **kwargs): def run(self, terms, variables=None, **kwargs):
if not isinstance(terms, list):
terms = [ terms ]
ret = [] ret = []
for term in terms: for term in terms:
basedir_path = self._loader.path_dwim(term) basedir_path = self._loader.path_dwim(term)
@ -43,13 +40,13 @@ class LookupModule(LookupBase):
# itself (which will be relative to the current working dir) # itself (which will be relative to the current working dir)
if 'role_path' in variables: if 'role_path' in variables:
relative_path = self._loader.path_dwim_relative(variables['role_path'], 'files', term, check=False) relative_path = self._loader.path_dwim_relative(variables['role_path'], 'files', term)
# FIXME: the original file stuff still needs to be worked out, but the # 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 # playbook_dir stuff should be able to be removed as it should
# be covered by the fact that the loader contains that info # be covered by the fact that the loader contains that info
#if 'playbook_dir' in variables: if 'playbook_dir' in variables:
# playbook_path = os.path.join(variables['playbook_dir'], term) playbook_path = self._loader.path_dwim_relative(variables['playbook_dir'],'files', term)
for path in (basedir_path, relative_path, playbook_path): for path in (basedir_path, relative_path, playbook_path):
try: try: