ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

changed missing file error to warning for lookups (#16800)

Browse source 
* changed missing file error to warning for lookups

* changed plugins that expected exception

warning will still be displayed, they now work with None value
This commit is contained in:
Brian Coca 2016-09-20 15:05:11 -04:00 committed by GitHub
parent 507700e42c
commit 1e4e188318
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,6 @@ __metaclass__ = type
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
from ansible.compat.six import with_metaclass from ansible.compat.six import with_metaclass
from ansible.errors import AnsibleFileNotFound
try: try:
from __main__ import display from __main__ import display
@ -115,6 +114,6 @@ class LookupBase(with_metaclass(ABCMeta, object)):
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:
raise AnsibleFileNotFound("Unable to find '%s' in expected paths." % needle) self._display.warning("Unable to find '%s' in expected paths." % needle)
return result return result

5
lib/ansible/plugins/lookup/fileglob.py
View file

@ -32,10 +32,7 @@ class LookupModule(LookupBase):
ret = [] ret = []
for term in terms: for term in terms:
term_file = os.path.basename(term) term_file = os.path.basename(term)
try: dwimmed_path = self.find_file_in_search_path(variables, 'files', os.path.dirname(term))
dwimmed_path = self.find_file_in_search_path(variables, 'files', os.path.dirname(term))
except AnsibleFileNotFound:
dwimmed_path = None
if dwimmed_path: if dwimmed_path:
globbed = glob.glob(to_bytes(os.path.join(dwimmed_path, term_file), errors='surrogate_or_strict')) globbed = glob.glob(to_bytes(os.path.join(dwimmed_path, term_file), errors='surrogate_or_strict'))
ret.extend(to_text(g, errors='surrogate_or_strict') for g in globbed if os.path.isfile(g)) ret.extend(to_text(g, errors='surrogate_or_strict') for g in globbed if os.path.isfile(g))

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

@ -181,11 +181,9 @@ 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
try: path = self.find_file_in_search_path(variables, subdir, fn)
path = self.find_file_in_search_path(variables, subdir, fn) if path is not None:
return [path] return [path]
except AnsibleFileNotFound:
continue
else: else:
if skip: if skip:
return [] return []