summaryrefslogtreecommitdiffstats
path: root/base/server/sbin
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2014-06-09 22:34:57 +0700
committerAde Lee <alee@redhat.com>2014-06-10 20:55:28 +0700
commita4fca6b7265924f0b656a1851970612a1c56e8c4 (patch)
treef34d3ea2d728c0f4f51d2f976fb40ba3ea8b54dc /base/server/sbin
parentf603869e1e9964617fc36c82d19a3105c59a2495 (diff)
downloadpki-a4fca6b7265924f0b656a1851970612a1c56e8c4.tar.gz
pki-a4fca6b7265924f0b656a1851970612a1c56e8c4.tar.xz
pki-a4fca6b7265924f0b656a1851970612a1c56e8c4.zip
More formatting changes
Improve the layout of strings in pkimessages and fix a couple more PEP 8 issues.
Diffstat (limited to 'base/server/sbin')
-rwxr-xr-xbase/server/sbin/pkispawn9
1 files changed, 4 insertions, 5 deletions
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index 41f5f5791..2f41afcce 100755
--- a/base/server/sbin/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -537,7 +537,6 @@ def print_install_information(mdict):
print log.PKI_SPAWN_INFORMATION_HEADER
if skip_configuration:
print log.PKI_CONFIGURATION_URL_1 % mdict['pki_configuration_url']
- print
print log.PKI_CONFIGURATION_RESTART_1 % \
mdict['pki_registry_initscript_command']
else:
@@ -548,9 +547,10 @@ def print_install_information(mdict):
mdict['pki_client_admin_cert_p12']
if not config.str2bool(mdict['pki_client_database_purge']):
print
- print " Administrator's certificate nickname:\n %s" % mdict['pki_admin_nickname']
- print " Administrator's certificate database:\n %s" % mdict['pki_client_database_dir']
- print
+ print " Administrator's certificate nickname:\n %s"\
+ % mdict['pki_admin_nickname']
+ print " Administrator's certificate database:\n %s"\
+ % mdict['pki_client_database_dir']
print log.PKI_CHECK_STATUS_MESSAGE % mdict['pki_instance_name']
print log.PKI_INSTANCE_RESTART_MESSAGE % mdict['pki_instance_name']
if (((config.pki_subsystem == "KRA" or
@@ -558,7 +558,6 @@ def print_install_information(mdict):
config.str2bool(mdict['pki_standalone'])) and
not config.str2bool(mdict['pki_external_step_two'])):
# Stand-alone PKI KRA/OCSP (External CA Step 1)
- print
print log.PKI_CONFIGURATION_STANDALONE_1 % config.pki_subsystem
else:
print log.PKI_ACCESS_URL % (mdict['pki_hostname'],