From 5c1e44830048f5b13656349c63b5319a536e3a8d Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Wed, 12 Aug 2020 18:30:29 +0300 Subject: [PATCH] uninstall: Clean up no longer used flag The `_server_trust_ad_installed` was added as a flag which indicates that `freeipa-server-trust-ad` package is installed. Later, `ipaserver/install/adtrustinstance.py` module was moved out into `freeipa-server` package and the import became unconditionally successful. Fixes: https://pagure.io/freeipa/issue/8461 Signed-off-by: Stanislav Levin Reviewed-By: Alexander Bokovoy --- ipaserver/install/server/install.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 12a6f75e2..fc316bdc0 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -38,7 +38,7 @@ from ipalib.util import ( no_matching_interface_for_ip_address_warning, ) from ipaserver.install import ( - adtrust, bindinstance, ca, dns, dsinstance, + adtrust, adtrustinstance, bindinstance, ca, dns, dsinstance, httpinstance, installutils, kra, krbinstance, otpdinstance, custodiainstance, replication, service, sysupgrade, cainstance) @@ -50,12 +50,6 @@ from ipaserver.install.installutils import ( if six.PY3: unicode = str -try: - from ipaserver.install import adtrustinstance - _server_trust_ad_installed = True -except ImportError: - _server_trust_ad_installed = False - NoneType = type(None) logger = logging.getLogger(__name__) @@ -1185,8 +1179,7 @@ def uninstall(installer): httpinstance.HTTPInstance(fstore).uninstall() krbinstance.KrbInstance(fstore).uninstall() dsinstance.DsInstance(fstore=fstore).uninstall() - if _server_trust_ad_installed: - adtrustinstance.ADTRUSTInstance(fstore).uninstall() + adtrustinstance.ADTRUSTInstance(fstore).uninstall() # realm isn't used, but IPAKEMKeys parses /etc/ipa/default.conf # otherwise, see https://pagure.io/freeipa/issue/7474 . custodiainstance.CustodiaInstance(realm='REALM.INVALID').uninstall()