https://fedorahosted.org/freeipa/ticket/5482
Patch attached.
From abceb5bea904984e9a50d0fcd454269d48c7b2cf Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> 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 --- 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 90edb362f496b89f433532bf8786c29da3902de9..5237a5aee8fda13ca3e27205938a8927dfb5752b 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -809,9 +809,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 ce4b5bc9aa04f70df32b9184a10728696ff091e3..311db3f0c423f7a9110766afd4d57fa3b24520be 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, [] -- 2.5.0
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
