openstack
/
horizon
Code Issues Proposed changes

Merge "Catch AttributeError when deleting temp file on image upload"

This commit is contained in:
Zuul 2020-03-10 22:23:20 +00:00 committed by Gerrit Code Review
parent 1a85ffd97c 2b55e3f7a7
commit db7bee00e6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openstack_dashboard/api/glance.py
View File

@ -511,13 +511,17 @@ def image_create(request, **kwargs):
try:
return glanceclient(request).images.upload(image.id, data)
finally:
filename = str(data.file.name)
try:
os.remove(filename)
except OSError as e:
LOG.warning('Failed to remove temporary image file '
'%(file)s (%(e)s)',
{'file': filename, 'e': e})
filename = str(data.file.name)
except AttributeError:
pass
else:
try:
os.remove(filename)
except OSError as e:
LOG.warning('Failed to remove temporary image file '
'%(file)s (%(e)s)',
{'file': filename, 'e': e})
thread.start_new_thread(upload, ())
return Image(image)