diff options
| -rw-r--r-- | ipa_server/ipaldap.py | 3 | ||||
| -rw-r--r-- | ipalib/errors.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ipa_server/ipaldap.py b/ipa_server/ipaldap.py index a76040213..b791e18e4 100644 --- a/ipa_server/ipaldap.py +++ b/ipa_server/ipaldap.py @@ -365,8 +365,7 @@ class IPAdmin(SimpleLDAPObject): self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl) self.add_s(*args) except ldap.ALREADY_EXISTS, e: - # duplicate value - raise e + raise errors.DuplicateEntry, "Entry already exists" except ldap.LDAPError, e: raise e return True diff --git a/ipalib/errors.py b/ipalib/errors.py index c00db9dc6..d0d917f6b 100644 --- a/ipalib/errors.py +++ b/ipalib/errors.py @@ -266,7 +266,7 @@ class NotFound(GenericError): """Entry not found""" faultCode = 1003 -class Duplicate(GenericError): +class DuplicateEntry(GenericError): """This entry already exists""" faultCode = 1004 @@ -349,7 +349,7 @@ def convertFault(fault): return fault for v in globals().values(): if type(v) == type(Exception) and issubclass(v,GenericError) and \ - code == getattr(v,'faultCode',None): + code == getattr(v,'faultCode',None): ret = v(fault.faultString) ret.fromFault = True return ret |