diff options
| author | Ana Krivokapic <akrivoka@redhat.com> | 2013-04-19 14:32:20 +0200 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2013-04-19 10:57:07 -0400 |
| commit | 2a8f1b0b16bb1a0af3906c06cffcd96bf152227a (patch) | |
| tree | 3cafb12c4131e74770adf687af51701a7bd2c55b /ipa-client | |
| parent | 9125285a051b133149f887130051b63c6d650971 (diff) | |
| download | freeipa-2a8f1b0b16bb1a0af3906c06cffcd96bf152227a.tar.gz freeipa-2a8f1b0b16bb1a0af3906c06cffcd96bf152227a.tar.xz freeipa-2a8f1b0b16bb1a0af3906c06cffcd96bf152227a.zip | |
Handle missing /etc/ipa in ipa-client-install
Make sure /etc/ipa is created and owned by freeipa-python package.
Report correct error to user if /etc/ipa is missing during client installation.
https://fedorahosted.org/freeipa/ticket/3551
Diffstat (limited to 'ipa-client')
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 126611a82..29adc93f3 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -1608,6 +1608,9 @@ def get_ca_cert(fstore, options, server, basedn): url = file_url() try: get_ca_cert_from_file(url) + except errors.FileError, e: + root_logger.debug(e) + raise except Exception, e: root_logger.debug(e) raise errors.NoCertificateError(entry=url) @@ -1658,6 +1661,9 @@ def get_ca_cert(fstore, options, server, basedn): except Exception, e: os.unlink(ca_file) raise + except errors.FileError, e: + root_logger.debug(e) + raise except (errors.NoCertificateError, errors.LDAPError), e: root_logger.debug(str(e)) url = http_url() @@ -2106,6 +2112,9 @@ def install(options, env, fstore, statestore): os.environ['KRB5_CONFIG'] = env['KRB5_CONFIG'] get_ca_cert(fstore, options, cli_server[0], cli_basedn) del os.environ['KRB5_CONFIG'] + except errors.FileError, e: + root_logger.error(e) + return CLIENT_INSTALL_ERROR except Exception, e: root_logger.error("Cannot obtain CA certificate\n%s", e) return CLIENT_INSTALL_ERROR |