The print_existing_ca_step_one_information() has been removed from
pkispawn since existing CA installation no longer requires two-step
operation.

https://fedorahosted.org/pki/ticket/1736

--
Endi S. Dewata
>From 33cd9a1a9749748a841c087518b898b55e0b23ae Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <[email protected]>
Date: Wed, 27 Apr 2016 02:27:57 +0200
Subject: [PATCH] Removed unused code for existing CA installation.

The print_existing_ca_step_one_information() has been removed from
pkispawn since existing CA installation no longer requires two-step
operation.

https://fedorahosted.org/pki/ticket/1736
---
 base/server/sbin/pkispawn | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index fa14d49096bc0455bbb055f5081d1c4abb12aa59..b019d8869e4247cc8c0c635775c37b96575df152 100755
--- a/base/server/sbin/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -543,11 +543,7 @@ def main(argv):
     step_one = deployer.configuration_file.external_step_one
 
     if external and step_one:
-        external_csr_path = deployer.mdict['pki_external_csr_path']
-        if external_csr_path:
-            print_external_ca_step_one_information(parser.mdict)
-        else:
-            print_existing_ca_step_one_information(parser.mdict)
+        print_external_ca_step_one_information(parser.mdict)
     else:
         print_install_information(parser.mdict)
 
@@ -676,17 +672,6 @@ def print_external_ca_step_one_information(mdict):
     print(log.PKI_SPAWN_INFORMATION_FOOTER)
 
 
-def print_existing_ca_step_one_information(mdict):
-
-    print(log.PKI_SPAWN_INFORMATION_HEADER)
-    print("      The %s subsystem of the '%s' instance is still incomplete." %
-          (config.pki_subsystem, mdict['pki_instance_name']))
-    print()
-    print("      Import an existing CA certificate with the key and the CSR, and\n"
-          "      the certificate chain if available, then continue the installation.")
-    print(log.PKI_SPAWN_INFORMATION_FOOTER)
-
-
 def print_install_information(mdict):
 
     skip_configuration = config.str2bool(mdict['pki_skip_configuration'])
-- 
2.5.5

_______________________________________________
Pki-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/pki-devel

Reply via email to