From 412104e34c0f85f32a4991bed0393b22e7cdf345 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 5 Feb 2009 13:12:11 -0500 Subject: Remove more unused files and functions, replace ipaerror with new error classes --- ipaserver/ipaldap.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipaserver/ipaldap.py') diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py index e7177b3e2..a490c3407 100644 --- a/ipaserver/ipaldap.py +++ b/ipaserver/ipaldap.py @@ -320,7 +320,7 @@ class IPAdmin(SimpleLDAPObject): # Too many results returned by search raise e except ldap.LDAPError, e: - raise e + raise errors.DatabaseError, e if not obj: raise errors2.NotFound(msg=notfound(args)) @@ -357,7 +357,7 @@ class IPAdmin(SimpleLDAPObject): ldap.TIMELIMIT_EXCEEDED), e: partial = 1 except ldap.LDAPError, e: - raise e + raise errors.DatabaseError, e if not entries: raise errors2.NotFound(msg=notfound(args)) @@ -514,7 +514,7 @@ class IPAdmin(SimpleLDAPObject): self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl) self.passwd_s(dn, oldpass, newpass) except ldap.LDAPError, e: - raise e + raise errors.DatabaseError, e return True def __wrapmethods(self): -- cgit