From d7618acb73f57a63aca0a9fcfa8bf5edb1cffdda Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 29 Aug 2011 11:16:52 -0400 Subject: Add common is_installed() fn, better uninstall logging, check for errors. The installer and ipactl used two different methods to determine whether IPA was configured, unify them. When uninstalling report any thing that looks suspicious and warn that a re-install may fail. This includes any remaining 389-ds instances and any state or files that remains after all the module uninstallers are complete. Add wrappers for removing files and directories to log failures. https://fedorahosted.org/freeipa/ticket/1715 --- install/tools/ipactl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'install/tools/ipactl') diff --git a/install/tools/ipactl b/install/tools/ipactl index 313b87662..f7b2adcfd 100755 --- a/install/tools/ipactl +++ b/install/tools/ipactl @@ -23,6 +23,7 @@ try: import os from ipaserver.install import service from ipaserver.install.dsinstance import config_dirname, realm_to_serverid + from ipaserver.install.installutils import is_ipa_configured from ipapython import sysrestore from ipapython import config from ipalib import api, errors @@ -51,7 +52,7 @@ class IpactlError(StandardError): return self.msg def check_IPA_configuration(): - if not sysrestore.FileStore('/var/lib/ipa/sysrestore').has_files(): + if not is_ipa_configured(): # LSB status code 6: program is not configured raise IpactlError("IPA is not configured " + "(see man pages of ipa-server-install for help)", 6) -- cgit