diff options
Diffstat (limited to 'ipaserver/install/server/install.py')
| -rw-r--r-- | ipaserver/install/server/install.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 6ecb87ac9..bd07793bb 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -1046,19 +1046,6 @@ def uninstall(installer): except Exception as e: pass - print("Removing IPA client configuration") - try: - (stdout, stderr, rc) = run([paths.IPA_CLIENT_INSTALL, "--on-master", - "--unattended", "--uninstall"], - raiseonerr=False) - if rc not in [0, 2]: - root_logger.debug("ipa-client-install returned %d" % rc) - raise RuntimeError(stdout) - except Exception as e: - rv = 1 - print("Uninstall of client side components failed!") - print("ipa-client-install returned: " + str(e)) - ntpinstance.NTPInstance(fstore).uninstall() kra.uninstall(False) @@ -1138,6 +1125,19 @@ def uninstall(installer): ' # getcert stop-tracking -i <request_id>\n' 'for each id in: %s' % ', '.join(ids)) + print("Removing IPA client configuration") + try: + (stdout, stderr, rc) = run([paths.IPA_CLIENT_INSTALL, "--on-master", + "--unattended", "--uninstall"], + raiseonerr=False) + if rc not in [0, 2]: + root_logger.debug("ipa-client-install returned %d" % rc) + raise RuntimeError(stdout) + except Exception as e: + rv = 1 + print("Uninstall of client side components failed!") + print("ipa-client-install returned: " + str(e)) + sys.exit(rv) |