openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Improve bulk symlink error handling"

This commit is contained in:
Zuul 2018-11-29 06:57:35 +00:00 committed by Gerrit Code Review
parent 2a2fe4f58c e348fab951
commit d0b31f9e4e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/utils.py
View File

@ -1110,7 +1110,12 @@ def bulk_symlink(log, src, dst, tmpd='/tmp'):
"""
log.debug("Symlinking %s to %s, via temp dir %s" %
(src, dst, tmpd))
tmp = None
try:
if not os.path.exists(tmpd):
raise exceptions.NotFound("{} does not exist. Cannot create a "
"temp folder using this path".format(
tmpd))
tmp = tempfile.mkdtemp(dir=tmpd)
subprocess.check_call(['mkdir', '-p', dst])
os.chmod(tmp, 0o755)
@ -1121,7 +1126,8 @@ def bulk_symlink(log, src, dst, tmpd='/tmp'):
except Exception:
raise
finally:
shutil.rmtree(tmp, ignore_errors=True)
if tmp:
shutil.rmtree(tmp, ignore_errors=True)
def run_command_and_log(log, cmd, cwd=None, env=None, retcode_only=True):