Merge lp:~rcarrillocruz/nova/lp836978 into lp:~hudson-openstack/nova/trunk

Proposed by Ricardo Carrillo Cruz
Status: Needs review
Proposed branch: lp:~rcarrillocruz/nova/lp836978
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
nova/api/ec2/ (+1/-1)
To merge this branch: bzr merge lp:~rcarrillocruz/nova/lp836978
Reviewer Review Type Date Requested Status
Sandy Walsh (community) Needs Fixing
Review via email:

Description of the change

Fixes lp836978

To post a comment you must log in.
Revision history for this message
Sandy Walsh (sandy-walsh) wrote :

Why bother with the try-except block if you're only going to re-raise?

review: Needs Fixing

Unmerged revisions

1570. By Ricardo Carrillo Cruz

Tested fix for lp836978

1569. By Ricardo Carrillo Cruz

Re-raising , more simple

1568. By Ricardo Carrillo Cruz

Raising InstanceNotFound exception

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/api/ec2/'
2--- nova/api/ec2/ 2011-09-16 15:17:34 +0000
3+++ nova/api/ec2/ 2011-09-21 10:39:28 +0000
4@@ -1231,7 +1231,7 @@
5 try:
6 instance = self.compute_api.get(context, internal_id)
7 except exception.NotFound:
8- continue
9+ raise
10 instances.append(instance)
11 else:
12 try: