IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

uninstall: Clean up no longer used flag

Browse Source 
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 <slev@altlinux.org>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Stanislav Levin 2020-08-12 18:30:29 +03:00 committed by Florence Blanc-Renaud
parent 89d86dac0a
commit 5c1e448300
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipaserver/install/server/install.py
View File

@ -38,7 +38,7 @@ from ipalib.util import (
no_matching_interface_for_ip_address_warning, no_matching_interface_for_ip_address_warning,
) )
from ipaserver.install import ( from ipaserver.install import (
adtrust, bindinstance, ca, dns, dsinstance, adtrust, adtrustinstance, bindinstance, ca, dns, dsinstance,
httpinstance, installutils, kra, krbinstance, httpinstance, installutils, kra, krbinstance,
otpdinstance, custodiainstance, replication, service, otpdinstance, custodiainstance, replication, service,
sysupgrade, cainstance) sysupgrade, cainstance)
@ -50,12 +50,6 @@ from ipaserver.install.installutils import (
if six.PY3: if six.PY3:
unicode = str unicode = str
try:
from ipaserver.install import adtrustinstance
_server_trust_ad_installed = True
except ImportError:
_server_trust_ad_installed = False
NoneType = type(None) NoneType = type(None)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -1185,8 +1179,7 @@ def uninstall(installer):
httpinstance.HTTPInstance(fstore).uninstall() httpinstance.HTTPInstance(fstore).uninstall()
krbinstance.KrbInstance(fstore).uninstall() krbinstance.KrbInstance(fstore).uninstall()
dsinstance.DsInstance(fstore=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 # realm isn't used, but IPAKEMKeys parses /etc/ipa/default.conf
# otherwise, see https://pagure.io/freeipa/issue/7474 . # otherwise, see https://pagure.io/freeipa/issue/7474 .
custodiainstance.CustodiaInstance(realm='REALM.INVALID').uninstall() custodiainstance.CustodiaInstance(realm='REALM.INVALID').uninstall()