diff options
author | Endi S. Dewata <edewata@redhat.com> | 2016-03-30 04:29:11 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2016-04-02 08:24:31 +0200 |
commit | 1bbb28fb2f0cbc023b7182d42b3def0891d34b47 (patch) | |
tree | 76c75999c20c71ff49888d9b52b09f8cf3de1c7e /base/server/sbin/pkidestroy | |
parent | e365df91b9f39e89bcff3f6e93cd43297e276374 (diff) | |
download | pki-1bbb28fb2f0cbc023b7182d42b3def0891d34b47.tar.gz pki-1bbb28fb2f0cbc023b7182d42b3def0891d34b47.tar.xz pki-1bbb28fb2f0cbc023b7182d42b3def0891d34b47.zip |
Install tools clean-up.
Some variables in pkispawn and pkidestroy have been renamed for
clarity.
The unused PKI_CERT_DB_PASSWORD_SLOT variable has been removed.
The constant pki_self_signed_token property has been moved into
default.cfg.
https://fedorahosted.org/pki/ticket/2247
Diffstat (limited to 'base/server/sbin/pkidestroy')
-rwxr-xr-x | base/server/sbin/pkidestroy | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/server/sbin/pkidestroy b/base/server/sbin/pkidestroy index 5ba59e79a..e65bbf828 100755 --- a/base/server/sbin/pkidestroy +++ b/base/server/sbin/pkidestroy @@ -258,12 +258,12 @@ def main(argv): pki_subsystem_scriptlets = parser.mdict['destroy_scriplets'].split() deployer = util.PKIDeployer(parser.mdict) rv = 0 - for pki_scriptlet in pki_subsystem_scriptlets: - scriptlet = __import__("pki.server.deployment.scriptlets." + - pki_scriptlet, - fromlist=[pki_scriptlet]) - instance = scriptlet.PkiScriptlet() - rv = instance.destroy(deployer) + for scriptlet_name in pki_subsystem_scriptlets: + scriptlet_module = __import__( + "pki.server.deployment.scriptlets." + scriptlet_name, + fromlist=[scriptlet_name]) + scriptlet = scriptlet_module.PkiScriptlet() + rv = scriptlet.destroy(deployer) if rv != 0: sys.exit(1) config.pki_log.debug(log.PKI_DICTIONARY_MASTER, |