openstack/glance
Code Issues Proposed changes

Merge "Fix unsaved exception in v1 API controller"

Browse Source
This commit is contained in:
Jenkins 2014-07-11 02:40:02 +00:00 committed by Gerrit Code Review
commit b937751ff8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glance/api/v1/images.py
View File

@ -1036,10 +1036,10 @@ class Controller(controller.BaseController):
if image['location']:
upload_utils.initiate_deletion(req, image['location'], id,
CONF.delayed_delete)
except Exception as e:
registry.update_image_metadata(req.context, id,
{'status': ori_status})
raise e
except Exception:
with excutils.save_and_reraise_exception():
registry.update_image_metadata(req.context, id,
{'status': ori_status})
registry.delete_image_metadata(req.context, id)
except exception.NotFound as e:
msg = (_("Failed to find image to delete: %s") %