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

Fix tilde expansion for fileglob

Browse source 
Use common suffix to determine what part of original term to keep and
how much of the full path to combine to get a usable filename.
This commit is contained in:
Daniel Hokka Zakrisson 2013-02-11 23:34:52 +01:00
parent 57e51f7fdf
commit 89e73c123f
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,11 @@ class LookupModule(object):
for term in terms:
dwimterms = utils.path_dwim(self.basedir, term)
# This skips whatever prefix the dwim added, leaving just the filename for the item
dwim_prefix_len = len(dwimterms) - len(term)
ret.extend([ f[dwim_prefix_len:]
i = -1
while dwimterms[i] == term[i] and -i < len(term) and -i < len(dwimterms):
i = i - 1
orig_prefix_len = i + 1
dwim_prefix_len = len(dwimterms) + i + 1
ret.extend([ term[:orig_prefix_len] + f[dwim_prefix_len:]
for f in glob.glob(dwimterms) if os.path.isfile(f) ])
return ret