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

no need for warnings in first_found

Browse source
This commit is contained in:
Brian Coca 2016-10-03 18:47:01 -04:00 committed by Brian Coca
parent 54ce6a9b7a
commit 125a8d3c65
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/lookup/__init__.py
View file

@ -102,7 +102,7 @@ class LookupBase(with_metaclass(ABCMeta, object)):
""" """
pass pass
def find_file_in_search_path(self, myvars, subdir, needle): def find_file_in_search_path(self, myvars, subdir, needle, ignore_missing=False):
''' '''
Return a file (needle) in the task's expected search path. Return a file (needle) in the task's expected search path.
''' '''
@ -113,7 +113,7 @@ class LookupBase(with_metaclass(ABCMeta, object)):
paths = self.get_basedir(myvars) paths = self.get_basedir(myvars)
result = self._loader.path_dwim_relative_stack(paths, subdir, needle) result = self._loader.path_dwim_relative_stack(paths, subdir, needle)
if result is None: if result is None and not ignore_missing:
self._display.warning("Unable to find '%s' in expected paths." % needle) self._display.warning("Unable to find '%s' in expected paths." % needle)
return result return result

2
lib/ansible/plugins/lookup/first_found.py
View file

@ -181,7 +181,7 @@ class LookupModule(LookupBase):
# get subdir if set by task executor, default to files otherwise # get subdir if set by task executor, default to files otherwise
subdir = getattr(self, '_subdir', 'files') subdir = getattr(self, '_subdir', 'files')
path = None path = None
path = self.find_file_in_search_path(variables, subdir, fn) path = self.find_file_in_search_path(variables, subdir, fn, ignore_missing=True)
if path is not None: if path is not None:
return [path] return [path]
else: else: