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

Additional changes to fix fileglob relative path lookups

Browse source
This commit is contained in:
James Cammarata 2015-07-27 16:35:27 -04:00
parent 9416fc6271
commit d6cafff2f9
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,8 @@ class LookupModule(LookupBase):
ret = []
for term in terms:
dwimmed = self._loader.path_dwim_relative(basedir, 'files', term)
globbed = glob.glob(dwimmed)
term_file = os.path.basename(term)
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))
return ret