diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2013-11-04 17:15:23 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-11-04 16:37:33 +0100 |
| commit | 90ac36c780d6e5d0bcb26f8c7f153d35af1db70f (patch) | |
| tree | 298142fdba343290463381b17bb78a79d3d1b205 | |
| parent | d261cc751efc7841ef720ceedf0abe07e6f211f6 (diff) | |
| download | freeipa.git-90ac36c780d6e5d0bcb26f8c7f153d35af1db70f.tar.gz freeipa.git-90ac36c780d6e5d0bcb26f8c7f153d35af1db70f.tar.xz freeipa.git-90ac36c780d6e5d0bcb26f8c7f153d35af1db70f.zip | |
Guard import of adtrustinstance for case without trusts
https://fedorahosted.org/freeipa/ticket/4011
| -rwxr-xr-x | install/tools/ipa-server-install | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index b3dcf6d9..458ebba5 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -40,7 +40,12 @@ import pwd import textwrap from optparse import OptionGroup, OptionValueError -from ipaserver.install import adtrustinstance +try: + from ipaserver.install import adtrustinstance + _server_trust_ad_installed = True +except ImportError: + _server_trust_ad_installed = False + from ipaserver.install import dsinstance from ipaserver.install import krbinstance from ipaserver.install import bindinstance @@ -493,7 +498,8 @@ def uninstall(): httpinstance.HTTPInstance(fstore).uninstall() krbinstance.KrbInstance(fstore).uninstall() dsinstance.DsInstance(fstore=fstore).uninstall() - adtrustinstance.ADTRUSTInstance(fstore).uninstall() + if _server_trust_ad_installed: + adtrustinstance.ADTRUSTInstance(fstore).uninstall() memcacheinstance.MemcacheInstance().uninstall() otpdinstance.OtpdInstance().uninstall() ipaservices.restore_network_configuration(fstore, sstore) |