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

Merge pull request #1643 from dhozac/fileglob-drop-dwim

Browse source 
Drop dwim prefix from returned items in fileglob
This commit is contained in:
Michael DeHaan 2012-11-17 16:31:13 -08:00
parent bb2e5e12b8 11afd84d32
commit 14f7bba64e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/runner/lookup_plugins/fileglob.py
View file

@ -25,7 +25,10 @@ class LookupModule(object):
self.basedir = basedir
def run(self, terms, **kwargs):
return [ f for f in glob.glob(utils.path_dwim(self.basedir, terms)) if os.path.isfile(f) ]
dwimterms = utils.path_dwim(self.basedir, terms)
# This skips whatever prefix the dwim added, leaving just the filename for the item
dwim_prefix_len = len(dwimterms) - len(terms)
return [ f[dwim_prefix_len:] for f in glob.glob(dwimterms) if os.path.isfile(f) ]