summaryrefslogtreecommitdiffstats
path: root/ipa_server
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2008-10-13 14:58:08 -0400
committerRob Crittenden <rcritten@redhat.com>2008-10-13 14:58:08 -0400
commit399b3794fb8dcc1447d1d6f029f57ef76ef21736 (patch)
treede6108f6fe159baa225d1d79f6afb602e131797a /ipa_server
parent250734aea539f0c49c21cb1cdc0310fcbf19f65c (diff)
downloadfreeipa-399b3794fb8dcc1447d1d6f029f57ef76ef21736.tar.gz
freeipa-399b3794fb8dcc1447d1d6f029f57ef76ef21736.tar.xz
freeipa-399b3794fb8dcc1447d1d6f029f57ef76ef21736.zip
Raise the right exceptions
Diffstat (limited to 'ipa_server')
-rw-r--r--ipa_server/ipaldap.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/ipa_server/ipaldap.py b/ipa_server/ipaldap.py
index b791e18e4..6a7e66442 100644
--- a/ipa_server/ipaldap.py
+++ b/ipa_server/ipaldap.py
@@ -396,8 +396,7 @@ class IPAdmin(SimpleLDAPObject):
modlist = self.generateModList(oldentry, newentry)
if len(modlist) == 0:
- # FIXME: better error
- raise SyntaxError("empty modlist")
+ raise errors.EmptyModlist
try:
if sctrl is not None:
@@ -407,9 +406,9 @@ class IPAdmin(SimpleLDAPObject):
# it indicates the previous attribute was removed by another
# update, making the oldentry stale.
except ldap.NO_SUCH_ATTRIBUTE:
- raise ipaldap.MidairCollision
+ raise errors.MidairCollision
except ldap.LDAPError, e:
- raise ipaldap.DatabaseError, e
+ raise errors.DatabaseError, e
return True
def generateModList(self, old_entry, new_entry):