diff options
| -rwxr-xr-x | client/ipa-client-install | 11 | ||||
| -rwxr-xr-x | install/tools/ipa-adtrust-install | 1 | ||||
| -rw-r--r-- | ipaserver/install/ca.py | 3 | ||||
| -rw-r--r-- | pylintrc | 1 |
4 files changed, 8 insertions, 8 deletions
diff --git a/client/ipa-client-install b/client/ipa-client-install index 884491eb0..be203586a 100755 --- a/client/ipa-client-install +++ b/client/ipa-client-install @@ -74,6 +74,11 @@ CLIENT_NOT_CONFIGURED = 2 CLIENT_ALREADY_CONFIGURED = 3 CLIENT_UNINSTALL_ERROR = 4 # error after restoring files/state + +fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) +statestore = sysrestore.StateFile(paths.IPA_CLIENT_SYSRESTORE) + + def parse_options(): def validate_ca_cert_file_option(option, opt, value, parser): if not os.path.exists(value): @@ -3068,12 +3073,6 @@ def main(): env={"PATH":"/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin"} - global fstore - fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) - - global statestore - statestore = sysrestore.StateFile(paths.IPA_CLIENT_SYSRESTORE) - if options.uninstall: return uninstall(options, env) diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index f972835ec..36caa5c2d 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -238,7 +238,6 @@ def main(): check_server_configuration() - global fstore fstore = sysrestore.FileStore(paths.SYSRESTORE) print("==============================================================================") diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py index 8420a8ddf..acc54334e 100644 --- a/ipaserver/install/ca.py +++ b/ipaserver/install/ca.py @@ -16,6 +16,9 @@ from ipalib import api, certstore, x509 from ipapython.dn import DN from ipapython.ipa_log_manager import root_logger +external_cert_file = None +external_ca_file = None + def install_check(standalone, replica_config, options): global external_cert_file @@ -33,7 +33,6 @@ disable= fixme, global-statement, global-variable-not-assigned, - global-variable-undefined, no-init, pointless-except, pointless-statement, |