openstack/horizon
Code Issues Proposed changes

Merge "Handle errors during glance image updates correctly"

Browse Source
This commit is contained in:
Jenkins
2015-06-18 00:35:02 +00:00
committed by Gerrit Code Review
parent e44d95fa21 7eb4e3595c
commit 1f29fbd93e
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/api/glance.py
View File

@@ -34,7 +34,6 @@ from django.core.files.uploadedfile import TemporaryUploadedFile
import glanceclient as glance_client import glanceclient as glance_client
from six.moves import _thread as thread from six.moves import _thread as thread
from horizon import exceptions
from horizon.utils import functions as utils from horizon.utils import functions as utils
from horizon.utils.memoized import memoized # noqa from horizon.utils.memoized import memoized # noqa
from openstack_dashboard.api import base from openstack_dashboard.api import base
@@ -111,9 +110,7 @@ def image_list_detailed(request, marker=None, sort_dir='desc',
def image_update(request, image_id, **kwargs): def image_update(request, image_id, **kwargs):
image_data = kwargs.get('data', None) image_data = kwargs.get('data', None)
try: try:
image = glanceclient(request).images.update(image_id, **kwargs) return glanceclient(request).images.update(image_id, **kwargs)
except Exception:
exceptions.handle(request, ignore=True)
finally: finally:
if image_data: if image_data:
try: try:
@@ -126,7 +123,6 @@ def image_update(request, image_id, **kwargs):
'%(file)s (%(e)s)') % '%(file)s (%(e)s)') %
dict(file=filename, e=str(e))) dict(file=filename, e=str(e)))
LOG.warn(msg) LOG.warn(msg)
return image
def image_create(request, **kwargs): def image_create(request, **kwargs):