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/subsystem_layout.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/subsystem_layout.py')
-rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py index 49899da68..2b2246a72 100644 --- a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py @@ -28,14 +28,14 @@ from .. import pkiscriptlet # PKI Deployment Subsystem Layout 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_SUBSYSTEM_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - return self.rv + return + config.pki_log.info(log.SUBSYSTEM_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) # establish instance-based subsystem logs @@ -118,7 +118,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.symlink.create( deployer.mdict['pki_instance_registry_path'], deployer.mdict['pki_subsystem_registry_link']) - return self.rv def destroy(self, deployer): @@ -146,4 +145,3 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # remove instance-based subsystem registry deployer.directory.delete( deployer.mdict['pki_subsystem_registry_path']) - return self.rv |