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

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