Merge "Correct reraising of exception"

This commit is contained in:
Jenkins 2016-07-15 13:31:25 +00:00 committed by Gerrit Code Review
commit 574326c020
2 changed files with 3 additions and 3 deletions

View File

@ -203,7 +203,7 @@ class OSClientManager(object):
time.sleep(5)
except Exception as e:
if str(e) == "snapshot has error state":
raise e
raise
LOG.exception(e)
return snapshot
@ -250,7 +250,7 @@ class OSClientManager(object):
raise Exception("Image have killed state")
except Exception as e:
if image.status in ("killed", "deleted"):
raise e
raise
LOG.exception(e)
LOG.warn("Exception getting image status")
return image

View File

@ -112,4 +112,4 @@ class QueuedThread(threading.Thread):
self._exception_queue.put_nowait(e)
self.rich_queue.force_stop()
# Thread will exit at this point.
raise e
raise