From 801672cc6618947f5cc4607910871e695587fcbf Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Wed, 25 Nov 2015 12:42:02 +0100 Subject: [PATCH] Remove invalid error messages from topology upgrade Return False does not mean that update failed, it mean that nothing has been updated, respectively ldap is up to date. https://fedorahosted.org/freeipa/ticket/5482 Reviewed-By: Tomas Babej --- ipaserver/install/cainstance.py | 4 +--- ipaserver/install/plugins/update_ca_topology.py | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 3632a3931..65f9e463d 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -595,9 +595,7 @@ class CAInstance(DogtagInstance): 'SUFFIX': api.env.basedn, 'FQDN': self.fqdn, }) - rv = ld.update([paths.CA_TOPOLOGY_ULDIF]) - if not rv: - raise RuntimeError("Failed to update CA topology configuration") + ld.update([paths.CA_TOPOLOGY_ULDIF]) def __disable_nonce(self): # Turn off Nonces diff --git a/ipaserver/install/plugins/update_ca_topology.py b/ipaserver/install/plugins/update_ca_topology.py index ce4b5bc9a..311db3f0c 100644 --- a/ipaserver/install/plugins/update_ca_topology.py +++ b/ipaserver/install/plugins/update_ca_topology.py @@ -25,9 +25,8 @@ class update_ca_topology(Updater): 'SUFFIX': self.api.env.basedn, 'FQDN': self.api.env.host, }) - rv = ld.update([paths.CA_TOPOLOGY_ULDIF]) - if not rv: - self.log.error("Failed to update CA topology configuration") + + ld.update([paths.CA_TOPOLOGY_ULDIF]) return False, []