diff options
| author | Josh Kearney <josh@jk0.org> | 2011-07-27 16:39:27 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-07-27 16:39:27 -0500 |
| commit | a57115ef474440f21a500ce4f8970a9fcd99840e (patch) | |
| tree | e55bff66fe963e524cb28de88946b0b6bb4dc914 /nova/exception.py | |
| parent | 0b4e10a48e2aaa816ce4ca4565068d1655ad53ef (diff) | |
| parent | ad00ca903b98fc33eca9f375b1e5dd146142839f (diff) | |
| download | nova-a57115ef474440f21a500ce4f8970a9fcd99840e.tar.gz nova-a57115ef474440f21a500ce4f8970a9fcd99840e.tar.xz nova-a57115ef474440f21a500ce4f8970a9fcd99840e.zip | |
Fixed conflict
Diffstat (limited to 'nova/exception.py')
| -rw-r--r-- | nova/exception.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/exception.py b/nova/exception.py index 38e705417..ea046b712 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -116,7 +116,8 @@ def wrap_exception(notifier=None, publisher_id=None, event_type=None, notifier.notify(publisher_id, temp_type, temp_level, payload) - if not isinstance(e, Error): + if (not isinstance(e, Error) and + not isinstance(e, NovaException)): #exc_type, exc_value, exc_traceback = sys.exc_info() LOG.exception(_('Uncaught exception')) #logging.error(traceback.extract_stack(exc_traceback)) |