summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-23 13:38:34 +0000
committerGerrit Code Review <review@openstack.org>2012-08-23 13:38:34 +0000
commitecee2d89ba98cfcf1a7d9a27f6336f1ca2ed5efd (patch)
tree8de6a8fb8854c65783d0378985838b5f95ba8eba
parent212f13b99255bf88e463c9392987e65bb486ad46 (diff)
parentdcb1e84fe0be383cb6f8f97820b67b29cc5ef95f (diff)
downloadkeystone-ecee2d89ba98cfcf1a7d9a27f6336f1ca2ed5efd.tar.gz
keystone-ecee2d89ba98cfcf1a7d9a27f6336f1ca2ed5efd.tar.xz
keystone-ecee2d89ba98cfcf1a7d9a27f6336f1ca2ed5efd.zip
Merge "Less information returned with IntegrityError"
-rw-r--r--keystone/identity/backends/sql.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index d13683c2..a3c8d1f1 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -46,7 +46,7 @@ def handle_conflicts(type='object'):
try:
return method(*args, **kwargs)
except sql.IntegrityError as e:
- raise exception.Conflict(type=type, details=str(e))
+ raise exception.Conflict(type=type, details=e.message)
return wrapper
return decorator