summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-03-17 17:07:24 +0000
committerTarmac <>2011-03-17 17:07:24 +0000
commite1e9a2eb38dc58c73eae8ae1b6dab69bf2baa868 (patch)
tree0b08225e5010f8cb649d8ff5a1496c7c350b09b9
parent699abfe9e645ddbc854b42725247ab8fcd61517e (diff)
parent1d64d0a3d7f25448361ce54e32bba3de68c7afd1 (diff)
downloadnova-e1e9a2eb38dc58c73eae8ae1b6dab69bf2baa868.tar.gz
nova-e1e9a2eb38dc58c73eae8ae1b6dab69bf2baa868.tar.xz
nova-e1e9a2eb38dc58c73eae8ae1b6dab69bf2baa868.zip
Remove unconditional raise, probably left over from debugging.
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 40a9da0e7..e257e44e7 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -959,7 +959,7 @@ class CloudController(object):
raise exception.NotFound(_('Image %s not found') % image_id)
internal_id = image['id']
del(image['id'])
- raise Exception(image)
+
image['properties']['is_public'] = (operation_type == 'add')
return self.image_service.update(context, internal_id, image)