summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-12 05:31:27 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-12 05:31:27 -0700
commit84a9e5a9ea3105513bb5a7ae9b30d49e6eb3bd3e (patch)
treea8e3e5183d00ee4554a25da978c910ddfd96d7eb
parentb8516a2239658f0734299049648cbf2828b845eb (diff)
downloadnova-84a9e5a9ea3105513bb5a7ae9b30d49e6eb3bd3e.tar.gz
nova-84a9e5a9ea3105513bb5a7ae9b30d49e6eb3bd3e.tar.xz
nova-84a9e5a9ea3105513bb5a7ae9b30d49e6eb3bd3e.zip
Integrity error is in a different exc file
-rw-r--r--nova/db/sqlalchemy/api.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index c96a97951..93c80d27c 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -25,6 +25,7 @@ from nova import flags
from nova.db.sqlalchemy import models
from nova.db.sqlalchemy.session import get_session
from sqlalchemy import or_
+from sqlalchemy.exc import IntegrityError
from sqlalchemy.orm import joinedload_all
from sqlalchemy.sql import func
@@ -636,7 +637,7 @@ def export_device_create_safe(_context, values):
export_device_ref[key] = value
try:
export_device_ref.save()
- except exc.IntegrityError:
+ except IntegrityError:
pass