diff options
| author | Ade Lee <alee@redhat.com> | 2014-06-06 22:29:02 +0800 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-06-10 20:54:49 +0700 |
| commit | 759565d9b641106fcd60988524659b1f5071592c (patch) | |
| tree | 99c5c77a6c03f1c38518c3afd98c11723cccbd20 /base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | |
| parent | cfb1486b7693b208c99f1853763404b2b5f68322 (diff) | |
| download | pki-759565d9b641106fcd60988524659b1f5071592c.tar.gz pki-759565d9b641106fcd60988524659b1f5071592c.tar.xz pki-759565d9b641106fcd60988524659b1f5071592c.zip | |
Reformat scriptlets to be in line with PEP8
Mostly handle pycharm warnings about code formatting.
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/slot_substitution.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py index 1230544b0..f86ae4900 100644 --- a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py +++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py @@ -37,11 +37,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): return self.rv config.pki_log.info(log.SLOT_ASSIGNMENT_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - deployer.file.copy_with_slot_substitution(deployer.mdict['pki_source_cs_cfg'], - deployer.mdict['pki_target_cs_cfg']) - deployer.file.copy_with_slot_substitution(deployer.mdict['pki_source_registry'], - deployer.mdict['pki_target_registry'], - overwrite_flag=True) + deployer.file.copy_with_slot_substitution( + deployer.mdict['pki_source_cs_cfg'], + deployer.mdict['pki_target_cs_cfg']) + deployer.file.copy_with_slot_substitution( + deployer.mdict['pki_source_registry'], + deployer.mdict['pki_target_registry'], + overwrite_flag=True) if deployer.mdict['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: deployer.file.copy_with_slot_substitution( deployer.mdict['pki_source_catalina_properties'], @@ -81,11 +83,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # This is ONLY necessary because XML comments cannot be "nested"! # deployer.file.copy(deployer.mdict['pki_target_subsystem_web_xml'], # deployer.mdict['pki_target_subsystem_web_xml_orig']) - # deployer.file.delete(deployer.mdict['pki_target_subsystem_web_xml']) + # deployer.file.delete( + # deployer.mdict['pki_target_subsystem_web_xml']) # util.xml_file.remove_filter_section_from_web_xml( # deployer.mdict['pki_target_subsystem_web_xml_orig'], # deployer.mdict['pki_target_subsystem_web_xml']) - # deployer.file.delete(deployer.mdict['pki_target_subsystem_web_xml_orig']) + # deployer.file.delete( + # deployer.mdict['pki_target_subsystem_web_xml_orig']) if deployer.mdict['pki_subsystem'] == "CA": deployer.file.copy_with_slot_substitution( deployer.mdict['pki_source_proxy_conf'], |