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

Pushed under one-liner/trivial rule.

--
Endi S. Dewata
>From 9702175023d260dc831c0e838a5307874c31aa09 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edew...@redhat.com>
Date: Sat, 16 Jul 2016 09:22:27 +0200
Subject: [PATCH] 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
---
 base/server/sbin/pkispawn | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index 11745b4c4b0b8e4dc41e925bf9bdb9a24599f68f..13139fa23fcae4b256e248fcd1b552448d4d039c 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." %
-- 
2.4.11

_______________________________________________
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel

Reply via email to