diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-13 23:18:52 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-13 23:18:52 -0500 |
| commit | e1e7386164f1df2eb13ce4ce2da420534036e55c (patch) | |
| tree | 19de0790ba7eec5f639a48b861a76ec23813db19 /base/deploy/src/scriptlets/finalization.py | |
| parent | d2b3fbef7d8be7566a485e18654e3c8706a30212 (diff) | |
| download | pki-ticket-399b.tar.gz pki-ticket-399b.tar.xz pki-ticket-399b.zip | |
Refactored str2bool().ticket-399b
Diffstat (limited to 'base/deploy/src/scriptlets/finalization.py')
| -rw-r--r-- | base/deploy/src/scriptlets/finalization.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py index 4f30551e0..35cff6dd2 100644 --- a/base/deploy/src/scriptlets/finalization.py +++ b/base/deploy/src/scriptlets/finalization.py @@ -35,7 +35,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_FINALIZATION_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv @@ -59,7 +59,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.file.copy(master['pki_manifest'], master['pki_manifest_spawn_archive']) # Optionally, programmatically 'restart' the configured PKI instance - if config.str2bool(master['pki_restart_configured_instance']): + if util.str2bool(master['pki_restart_configured_instance']): util.systemd.restart() # Optionally, 'purge' the entire temporary client infrastructure # including the client NSS security databases and password files @@ -68,12 +68,12 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # placed under this infrastructure, it may accidentally # be deleted! # - if config.str2bool(master['pki_client_database_purge']): + if util.str2bool(master['pki_client_database_purge']): if util.directory.exists(master['pki_client_dir']): util.directory.delete(master['pki_client_dir']) # If instance has not been configured, print the # configuration URL to the log - if config.str2bool(master['pki_skip_configuration']): + if util.str2bool(master['pki_skip_configuration']): util.configuration_file.log_configuration_url() # Log final process messages pkilogging.pki_log.info(log.PKISPAWN_END_MESSAGE_2, @@ -83,7 +83,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.file.modify(master['pki_spawn_log'], silent=True) # If instance has not been configured, print the # configuration URL to the screen - if config.str2bool(master['pki_skip_configuration']): + if util.str2bool(master['pki_skip_configuration']): util.configuration_file.display_configuration_url() return self.rv |