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

1 files changed, 6 insertions, 6 deletions

diff --git a/base/server/sbin/pkidestroy b/base/server/sbin/pkidestroy
index 12d37f2f3..d7285c7e5 100755
--- a/base/server/sbin/pkidestroy
+++ b/base/server/sbin/pkidestroy
@@ -257,12 +257,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,