diff options
Diffstat (limited to 'ipaserver/install')
-rw-r--r-- | ipaserver/install/krbinstance.py | 4 | ||||
-rw-r--r-- | ipaserver/install/ldapupdate.py | 14 | ||||
-rw-r--r-- | ipaserver/install/replication.py | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 50df2968..6a45d345 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -35,7 +35,7 @@ import installutils from ipapython import sysrestore from ipapython import ipautil from ipalib import util -from ipalib import errors2 +from ipalib import errors from ipaserver import ipaldap @@ -322,7 +322,7 @@ class KrbInstance(service.Service): def __write_stash_from_ds(self): try: entry = self.conn.getEntry("cn=%s, cn=kerberos, %s" % (self.realm, self.suffix), ldap.SCOPE_SUBTREE) - except errors2.NotFound: + except errors.NotFound: logging.critical("Could not find master key in DS") raise e diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 17b519b3..ce12607e 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -29,7 +29,7 @@ from ipaserver.install import installutils from ipaserver import ipaldap from ipapython import entity, ipautil from ipalib import util -from ipalib import errors2 +from ipalib import errors import ldap import logging import krbV @@ -310,10 +310,10 @@ class LDAPUpdate: while True: try: entry = self.conn.getEntry(dn, ldap.SCOPE_BASE, "(objectclass=*)", attrlist) - except errors2.NotFound, e: + except errors.NotFound, e: logging.error("Task not found: %s", dn) return - except errors2.DatabaseError, e: + except errors.DatabaseError, e: logging.error("Task lookup failure %s", e) return @@ -480,11 +480,11 @@ class LDAPUpdate: entry = self.__entry_to_entity(e[0]) found = True logging.info("Updating existing entry: %s", entry.dn) - except errors2.NotFound: + except errors.NotFound: # Doesn't exist, start with the default entry entry = new_entry logging.info("New entry: %s", entry.dn) - except errors2.DatabaseError: + except errors.DatabaseError: # Doesn't exist, start with the default entry entry = new_entry logging.info("New entry, using default value: %s", entry.dn) @@ -521,10 +521,10 @@ class LDAPUpdate: if self.live_run and updated: self.conn.updateEntry(entry.dn, entry.origDataDict(), entry.toDict()) logging.info("Done") - except errors2.EmptyModlist: + except errors.EmptyModlist: logging.info("Entry already up-to-date") updated = False - except errors2.DatabaseError, e: + except errors.DatabaseError, e: logging.error("Update failed: %s", e) updated = False diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 12db0eb0..653ec3c4 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -24,7 +24,7 @@ from ipaserver.install import dsinstance from ipaserver import ipaldap from ldap import modlist from ipalib import util -from ipalib import errors2 +from ipalib import errors DIRMAN_CN = "cn=directory manager" CACERT="/usr/share/ipa/html/ca.crt" @@ -148,7 +148,7 @@ class ReplicationManager: conn.getEntry(dn, ldap.SCOPE_BASE) # replication is already configured return - except errors2.NotFound: + except errors.NotFound: pass replica_type = self.get_replica_type() @@ -220,7 +220,7 @@ class ReplicationManager: try: entry = self.conn.getEntry("cn=mapping tree,cn=config", ldap.SCOPE_ONELEVEL, "(cn=\"%s\")" % (self.suffix)) - except errors2.NotFound, e: + except errors.NotFound, e: logging.debug("failed to find mappting tree entry for %s" % self.suffix) raise e @@ -256,7 +256,7 @@ class ReplicationManager: conn.getEntry(pass_dn, ldap.SCOPE_BASE) print "Windows PassSync entry exists, not resetting password" return - except errors2.NotFound: + except errors.NotFound: pass # The user doesn't exist, add it @@ -315,7 +315,7 @@ class ReplicationManager: try: a.getEntry(dn, ldap.SCOPE_BASE) return - except errors2.NotFound: + except errors.NotFound: pass iswinsync = kargs.get("winsync", False) |