diff options
Diffstat (limited to 'base/server/sbin/pkispawn')
| -rwxr-xr-x | base/server/sbin/pkispawn | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index caa5e9bee..21333e722 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -514,25 +514,26 @@ def main(argv): # Process the various "scriptlets" to create the specified PKI subsystem. pki_subsystem_scriptlets = parser.mdict['spawn_scriplets'].split() deployer = util.PKIDeployer(parser.mdict, parser.slots_dict) - rv = 0 - for scriptlet_name in pki_subsystem_scriptlets: - scriptlet_module = __import__( - "pki.server.deployment.scriptlets." + scriptlet_name, - fromlist=[scriptlet_name]) - scriptlet = scriptlet_module.PkiScriptlet() - try: - rv = scriptlet.spawn(deployer) - # pylint: disable=W0703 - except Exception: - log_error_details() - print() - print("Installation failed.") - print() - sys.exit(1) - if rv != 0: - print("Nothing here!!!") - print("Installation failed.") - sys.exit(1) + + try: + for scriptlet_name in pki_subsystem_scriptlets: + + scriptlet_module = __import__( + "pki.server.deployment.scriptlets." + scriptlet_name, + fromlist=[scriptlet_name]) + + scriptlet = scriptlet_module.PkiScriptlet() + + scriptlet.spawn(deployer) + + # pylint: disable=W0703 + except Exception as e: + log_error_details() + print() + print("Installation failed: %s" % e) + print() + sys.exit(1) + config.pki_log.debug(log.PKI_DICTIONARY_MASTER, extra=config.PKI_INDENTATION_LEVEL_0) config.pki_log.debug(pkilogging.log_format(parser.mdict), |