openstack
/
instack
Code Issues Proposed changes

Merge "Don't use cache directory in home user dir with sudo"

This commit is contained in:
Jenkins 2017-04-06 12:44:02 +00:00 committed by Gerrit Code Review
parent ef9f6d0eae 47c2bc4b4d
commit 29d617c712
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
instack/main.py
View File

@ -92,7 +92,9 @@ def set_environment(tmp_dir):
os.environ['DIB_OFFLINE'] = ''
os.environ['DIB_INIT_SYSTEM'] = 'systemd'
os.environ['DIB_IMAGE_CACHE'] = (
'%s/.cache/image-create' % os.environ['HOME'])
'/root/.cache/image-create' if os.environ['USER'] == 'root'
else '%s/.cache/image-create' % os.environ['HOME']
)
os.environ['IMAGE_NAME'] = 'instack'
os.environ['PATH'] = "%s:/usr/local/bin" % os.environ['PATH']
os.environ.setdefault('DIB_DEFAULT_INSTALLTYPE', 'package')