openstack/python-glanceclient
Code Issues Proposed changes

Merge "Do not crash on homedir mkdir"

Browse Source
This commit is contained in:
Jenkins
2015-05-14 19:14:38 +00:00
committed by Gerrit Code Review
parent 9c172fb056 1686d6aa53
commit 688f902305
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glanceclient/shell.py
View File

@@ -556,7 +556,15 @@ class OpenStackImagesShell(object):
def _cache_schemas(self, options, home_dir='~/.glanceclient'): def _cache_schemas(self, options, home_dir='~/.glanceclient'):
homedir = expanduser(home_dir) homedir = expanduser(home_dir)
if not os.path.exists(homedir): if not os.path.exists(homedir):
os.makedirs(homedir) try:
os.makedirs(homedir)
except OSError as e:
# This avoids glanceclient to crash if it can't write to
# ~/.glanceclient, which may happen on some env (for me,
# it happens in Jenkins, as Glanceclient can't write to
# /var/lib/jenkins).
msg = '%s' % e
print(encodeutils.safe_decode(msg), file=sys.stderr)
resources = ['image', 'metadefs/namespace', 'metadefs/resource_type'] resources = ['image', 'metadefs/namespace', 'metadefs/resource_type']
schema_file_paths = [homedir + os.sep + x + '_schema.json' schema_file_paths = [homedir + os.sep + x + '_schema.json'