diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-07-16 09:22:27 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-07-20 01:00:43 +0200 |
| commit | 28176087a94f74b451c2dbf3c59b4d13a20014c6 (patch) | |
| tree | 0553e53d43df2b4f888e6d8e7738d06e4883ad40 /base/server/sbin/pkispawn | |
| parent | d20638e2916fb99da5cf09d869a1fbc89cd6f17b (diff) | |
| download | pki-28176087a94f74b451c2dbf3c59b4d13a20014c6.tar.gz pki-28176087a94f74b451c2dbf3c59b4d13a20014c6.tar.xz pki-28176087a94f74b451c2dbf3c59b4d13a20014c6.zip | |
Fixed pkispawn installation summary.
The pkispawn installation summary has been modified not to
show the admin certificate nickname and NSS database if
pki_client_database_purge or pki_clone is set to true since
the NSS database will not be created in those cases.
https://fedorahosted.org/pki/ticket/2399
Diffstat (limited to 'base/server/sbin/pkispawn')
| -rwxr-xr-x | base/server/sbin/pkispawn | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index 11745b4c4..13139fa23 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -754,16 +754,15 @@ def print_final_install_information(mdict): print(" Administrator's PKCS #12 file:\n %s" % mdict['pki_client_admin_cert_p12']) - if not config.str2bool(mdict['pki_client_database_purge']): + if not config.str2bool(mdict['pki_client_database_purge']) and \ + not config.str2bool(mdict['pki_clone']): print() print(" Administrator's certificate nickname:\n %s" % mdict['pki_admin_nickname']) - - if not config.str2bool(mdict['pki_clone']): print(" Administrator's certificate database:\n %s" % mdict['pki_client_database_dir']) - else: + if config.str2bool(mdict['pki_clone']): print() print(" This %s subsystem of the '%s' instance\n" " is a clone." % |