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

Pass the absolute path to dirname when assigning basedir (#17457)

Browse source 
* Pass the absolute path to dirname when assigning basedir

If no path is specified when calling the playbook, os.path.dirname(playbook_path) returns ''
This will cause failure when creating the retry file.

Fixes #17456

* Updated to use os.pathdirname(os.path.abspath())
This commit is contained in:
Andrea Tartaglia 2016-09-16 16:19:43 +01:00 committed by Toshio Kuratomi
parent fb71a9dfd9
commit 7bfa36eb8b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/executor/playbook_executor.py
View file

@ -187,7 +187,7 @@ class PlaybookExecutor:
if C.RETRY_FILES_SAVE_PATH: if C.RETRY_FILES_SAVE_PATH:
basedir = C.shell_expand(C.RETRY_FILES_SAVE_PATH) basedir = C.shell_expand(C.RETRY_FILES_SAVE_PATH)
elif playbook_path: elif playbook_path:
basedir = os.path.dirname(playbook_path) basedir = os.path.dirname(os.path.abspath(playbook_path))
else: else:
basedir = '~/' basedir = '~/'