openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Ensure that --output-env-file handles path expansion"

This commit is contained in:
Zuul 2019-10-12 04:41:13 +00:00 committed by Gerrit Code Review
parent d5e3726999 0ebccf267f
commit 8ce8b93cbe
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tripleoclient/v1/container_image.py
View File

@ -459,12 +459,14 @@ class PrepareImageFiles(command.Command):
)
if parsed_args.output_env_file:
params = prepare_data[parsed_args.output_env_file]
if os.path.exists(parsed_args.output_env_file):
output_env_file_expanded = os.path.expanduser(
parsed_args.output_env_file)
if os.path.exists(output_env_file_expanded):
self.log.warning("Output env file exists, "
"moving it to backup.")
shutil.move(parsed_args.output_env_file,
parsed_args.output_env_file + ".backup")
utils.safe_write(parsed_args.output_env_file,
shutil.move(output_env_file_expanded,
output_env_file_expanded + ".backup")
utils.safe_write(output_env_file_expanded,
build_env_file(params, self.app.command_options))
result = prepare_data[output_images_file]