openstack
/
keystone
Code Issues Proposed changes

Merge "Do not return identical error messages twice"

This commit is contained in:
Jenkins 2011-09-30 15:36:32 +00:00 committed by Gerrit Code Review
parent 9e59bd29d5 e7c4c4b028
commit 11ad2c1cb7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/controllers/auth.py
View File

@ -24,7 +24,10 @@ class AuthController(wsgi.Controller):
result = config.SERVICE.authenticate_with_unscoped_token(
unscoped)
except fault.BadRequestFault as e2:
raise fault.BadRequestFault(e1.msg + ' or ' + e2.msg)
if e1.msg == e2.msg:
raise e1
else:
raise fault.BadRequestFault(e1.msg + ' or ' + e2.msg)
return utils.send_result(200, req, result)