Applied Rob's errors patch

1 files changed, 7 insertions, 7 deletions

diff --git a/ipaserver/servercore.py b/ipaserver/servercore.py
index 19adb019f..c97148b37 100644
--- a/ipaserver/servercore.py
+++ b/ipaserver/servercore.py
@@ -23,7 +23,7 @@ import re
 from ipalib.request import context
 from ipaserver import ipaldap
 import ipautil
-from ipalib import errors
+from ipalib import errors, errors2
 from ipalib import api
 
 def convert_entry(ent):
@@ -186,7 +186,7 @@ def entry_exists(dn):
     try:
         get_base_entry(dn, "objectclass=*", ['dn','objectclass'])
         return True
-    except errors.NotFound:
+    except errors2.NotFound:
         return False
 
 def get_user_by_uid (uid, sattrs):
@@ -270,7 +270,7 @@ def search(base, filter, attributes, timelimit=1, sizelimit=3000):
         results = context.ldap.conn.getListAsync(base, ldap.SCOPE_SUBTREE,
             filter, attributes, 0, None, None, timelimit, sizelimit)
     except ldap.NO_SUCH_OBJECT:
-        raise errors.NotFound
+        raise errors2.NotFound
 
     counter = results[0]
     entries = [counter]
@@ -317,7 +317,7 @@ def get_ipa_config():
         config = get_sub_entry("cn=etc," + api.env.basedn, searchfilter)
     except ldap.NO_SUCH_OBJECT, e:
         # FIXME
-        raise errors.NotFound
+        raise errors2.NotFound
 
     return config
 
@@ -409,12 +409,12 @@ def add_member_to_group(member_dn, group_dn, memberattr='member'):
 
     group = get_entry_by_dn(group_dn, None)
     if group is None:
-        raise errors.NotFound
+        raise errors2.NotFound
 
     # check to make sure member_dn exists
     member_entry = get_base_entry(member_dn, "(objectClass=*)", ['dn','objectclass'])
     if not member_entry:
-        raise errors.NotFound
+        raise errors2.NotFound
 
     # Add the new member to the group member attribute
     members = group.get(memberattr, [])
@@ -433,7 +433,7 @@ def remove_member_from_group(member_dn, group_dn, memberattr='member'):
 
     group = get_entry_by_dn(group_dn, None)
     if group is None:
-        raise errors.NotFound
+        raise errors2.NotFound
     """
     if group.get('cn') == "admins":
         member = get_entry_by_dn(member_dn, ['dn','uid'])