Skip to content

A
ansible
Commit d6cafff2 by James Cammarata
Options

Additional changes to fix fileglob relative path lookups

parent 9416fc62
Showing with 3 additions and 2 deletions
lib/ansible/plugins/lookup/fileglob.py
...@@ -30,7 +30,8 @@ class LookupModule(LookupBase): ...@@ -30,7 +30,8 @@ class LookupModule(LookupBase):
ret = [] ret = []
for term in terms: for term in terms:
dwimmed = self._loader.path_dwim_relative(basedir, 'files', term) term_file = os.path.basename(term)
globbed = glob.glob(dwimmed) dwimmed_path = self._loader.path_dwim_relative(basedir, '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)) ret.extend(g for g in globbed if os.path.isfile(g))
return ret return ret
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment