ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 13:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Restore previous behavior of ignoring missing files via with_fileglob (#17053)

Browse source 
Fixes #16801
This commit is contained in:
jctanner 2016-08-11 19:55:21 -04:00 • committed by GitHub
commit 39d764c7ad
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import os
import glob import glob
from ansible.plugins.lookup import LookupBase from ansible.plugins.lookup import LookupBase
from ansible.errors import AnsibleFileNotFound
class LookupModule(LookupBase): class LookupModule(LookupBase):
@ -29,7 +30,11 @@ 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)
dwimmed_path = self.find_file_in_search_path(variables, 'files', os.path.dirname(term)) try:
globbed = glob.glob(os.path.join(dwimmed_path, term_file)) dwimmed_path = self.find_file_in_search_path(variables, 'files', os.path.dirname(term))
ret.extend(g for g in globbed if os.path.isfile(g)) except AnsibleFileNotFound:
dwimmed_path = None
if dwimmed_path:
globbed = glob.glob(os.path.join(dwimmed_path, term_file))
ret.extend(g for g in globbed if os.path.isfile(g))
return ret return ret