IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't pass non-existent arguments to _handle_errors()

Browse Source
This commit is contained in:
Rob Crittenden 2009-05-13 16:52:30 -04:00
parent 87480b7bde
commit 9147f0da69
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipaserver/ipaldap.py
View File

@ -297,7 +297,7 @@ class IPAdmin(SimpleLDAPObject):
# re-raise the error so we can handle it # re-raise the error so we can handle it
raise e raise e
except ldap.NO_SUCH_OBJECT, e: except ldap.NO_SUCH_OBJECT, e:
args = kw.get('args', '') args = kw.get('args', ["entry not found"])
raise errors.NotFound(reason=notfound(args)) raise errors.NotFound(reason=notfound(args))
except ldap.ALREADY_EXISTS, e: except ldap.ALREADY_EXISTS, e:
raise errors.DuplicateEntry() raise errors.DuplicateEntry()
@ -459,8 +459,7 @@ class IPAdmin(SimpleLDAPObject):
self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl) self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl)
self.modrdn_s(dn, newrdn, delold=1) self.modrdn_s(dn, newrdn, delold=1)
except ldap.LDAPError, e: except ldap.LDAPError, e:
kw = {'args': args} self.__handle_errors(e, **{})
self.__handle_errors(e, **kw)
return True return True
def updateEntry(self,dn,oldentry,newentry): def updateEntry(self,dn,oldentry,newentry):
@ -479,8 +478,7 @@ class IPAdmin(SimpleLDAPObject):
self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl) self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl)
self.modify_s(dn, modlist) self.modify_s(dn, modlist)
except ldap.LDAPError, e: except ldap.LDAPError, e:
kw = {'args': args} self.__handle_errors(e, **{})
self.__handle_errors(e, **kw)
return True return True
def generateModList(self, old_entry, new_entry): def generateModList(self, old_entry, new_entry):
@ -538,8 +536,7 @@ class IPAdmin(SimpleLDAPObject):
self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl) self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl)
self.modify_s(dn, modlist) self.modify_s(dn, modlist)
except ldap.LDAPError, e: except ldap.LDAPError, e:
kw = {'args': args} self.__handle_errors(e, **{})
self.__handle_errors(e, **kw)
return True return True
def deleteEntry(self,*args): def deleteEntry(self,*args):
@ -571,8 +568,7 @@ class IPAdmin(SimpleLDAPObject):
self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl) self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl)
self.passwd_s(dn, oldpass, newpass) self.passwd_s(dn, oldpass, newpass)
except ldap.LDAPError, e: except ldap.LDAPError, e:
kw = {'args': args} self.__handle_errors(e, **{})
self.__handle_errors(e, **kw)
return True return True
def __wrapmethods(self): def __wrapmethods(self):