From 84a9e5a9ea3105513bb5a7ae9b30d49e6eb3bd3e Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Sun, 12 Sep 2010 05:31:27 -0700
Subject: Integrity error is in a different exc file

---
 nova/db/sqlalchemy/api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
 
 
-- 
cgit