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

When cleaning up the AnsiBallZ tempdir we need to not fail if the tempdir wasn't created

Browse source 
If the temp directory creation failed in mkdtemp then temp_path is never
given a value.  This would lead to a NameError exception which would
obfuscate the original error (out of disk space being a common one).  By
catching NameError, python will raise the original exception as we want.

Fixes #17215
This commit is contained in:
Toshio Kuratomi 2017-06-06 07:59:50 -07:00
parent 966b5fd1a0
commit 80c1765653
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/module_common.py
View file

@ -345,7 +345,7 @@ if __name__ == '__main__':
finally: finally:
try: try:
shutil.rmtree(temp_path) shutil.rmtree(temp_path)
except OSError: except (NameError, OSError):
# tempdir creation probably failed # tempdir creation probably failed
pass pass
sys.exit(exitcode) sys.exit(exitcode)