diff options
author | Endi S. Dewata <edewata@redhat.com> | 2016-04-26 22:32:41 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2016-04-28 16:30:31 +0200 |
commit | 69a52e1179326895632ac0b4639ed8a8523091c9 (patch) | |
tree | 2907dafa37ccedb72f8da1f0d37965822ad3f6cb /base/server/python/pki/server/deployment/scriptlets/security_databases.py | |
parent | 6f9d417ff906360ee2f39a432cd3faccc3f52a2e (diff) | |
download | pki-69a52e1179326895632ac0b4639ed8a8523091c9.tar.gz pki-69a52e1179326895632ac0b4639ed8a8523091c9.tar.xz pki-69a52e1179326895632ac0b4639ed8a8523091c9.zip |
Removed unused variables in deployment scriptlets.
The unused rv instance variables in all deployment scriptlets have
been removed. The spawn() and destroy() are now returning None
instead of error code. If an error happens during execution the
scriptlet will throw an exception which will be caught by pkispawn
or pkidestroy and then displayed to the user.
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/security_databases.py')
-rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/security_databases.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/security_databases.py b/base/server/python/pki/server/deployment/scriptlets/security_databases.py index ed8c0ce09..c3ae89090 100644 --- a/base/server/python/pki/server/deployment/scriptlets/security_databases.py +++ b/base/server/python/pki/server/deployment/scriptlets/security_databases.py @@ -32,14 +32,13 @@ from .. import pkiscriptlet # PKI Deployment Security Databases Scriptlet class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): - rv = 0 def spawn(self, deployer): if config.str2bool(deployer.mdict['pki_skip_installation']): config.pki_log.info(log.SKIP_SECURITY_DATABASES_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - return self.rv + return config.pki_log.info(log.SECURITY_DATABASES_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) @@ -158,7 +157,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # Always delete the temporary 'pfile' deployer.file.delete(deployer.mdict['pki_shared_pfile']) - return self.rv def update_external_certs_conf(self, external_path, deployer): external_certs = pki.server.PKIInstance.read_external_certs( @@ -182,4 +180,3 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.file.delete(deployer.mdict['pki_key_database']) deployer.file.delete(deployer.mdict['pki_secmod_database']) deployer.file.delete(deployer.mdict['pki_shared_password_conf']) - return self.rv |