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

Fix search path for relative paths in roles (fixes #17877)

Browse source 
(cherry picked from commit 72f0aaf606)
This commit is contained in:
Andrew Gaffney 2016-10-12 21:36:52 -06:00 committed by Brian Coca
parent 9bdde13126
commit 194c9c41eb
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/parsing/dataloader.py
View file

@ -313,7 +313,11 @@ class DataLoader():
search.append(os.path.join(os.path.dirname(b_mydir), b_dirname, b_source))
search.append(os.path.join(b_mydir, b_source))
else:
search.append(os.path.join(b_upath, b_dirname, b_source))
# don't add dirname if user already is using it in source
if b_source.split(b'/')[0] == b_dirname:
search.append(os.path.join(b_upath, b_source))
else:
search.append(os.path.join(b_upath, b_dirname, b_source))
search.append(os.path.join(b_upath, b'tasks', b_source))
elif b_dirname not in b_source.split(b'/'):
# don't add dirname if user already is using it in source