summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-21 10:19:28 +0000
committerGerrit Code Review <review@openstack.org>2014-11-21 10:19:28 +0000
commitdef65d3a891a15a671f0713d3dbc9563228af9a7 (patch)
tree4e4ce029652fe03d8d225c1ede1f4e162067a495
parentda74ffdd43790dac92c41769416eb4ed126825d4 (diff)
parent22b1992dc40b6c3755434b6a7ee5861688674c2f (diff)
downloadglance-def65d3a891a15a671f0713d3dbc9563228af9a7.tar.gz
Merge "Fix for adopt glance.store library in Glance" into stable/juno
-rw-r--r--glance/api/v1/images.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py
index 3b460272f..c85b30131 100644
--- a/glance/api/v1/images.py
+++ b/glance/api/v1/images.py
@@ -459,7 +459,7 @@ class Controller(controller.BaseController):
image_data, image_size = src_store.get(loc, context=context)
- except exception.NotFound as e:
+ except store.NotFound as e:
raise HTTPNotFound(explanation=e.msg)
image_size = int(image_size) if image_size else None
return image_data, image_size
@@ -721,7 +721,7 @@ class Controller(controller.BaseController):
try:
return (image_meta.get('size', 0) or
store.get_size_from_backend(location, context=context))
- except (exception.NotFound, store.BadStoreUri) as e:
+ except (store.NotFound, store.BadStoreUri) as e:
LOG.debug(e)
raise HTTPBadRequest(explanation=e.msg, content_type="text/plain")