diff options
| author | Ade Lee <alee@redhat.com> | 2014-06-09 22:34:57 +0700 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-06-10 20:55:28 +0700 |
| commit | a4fca6b7265924f0b656a1851970612a1c56e8c4 (patch) | |
| tree | f34d3ea2d728c0f4f51d2f976fb40ba3ea8b54dc /base/server/python/pki/server/deployment/scriptlets | |
| parent | f603869e1e9964617fc36c82d19a3105c59a2495 (diff) | |
| download | pki-a4fca6b7265924f0b656a1851970612a1c56e8c4.tar.gz pki-a4fca6b7265924f0b656a1851970612a1c56e8c4.tar.xz pki-a4fca6b7265924f0b656a1851970612a1c56e8c4.zip | |
More formatting changes
Improve the layout of strings in pkimessages and fix
a couple more PEP 8 issues.
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/selinux_setup.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py index b6f1fd9c3..daf41423f 100644 --- a/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py +++ b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py @@ -68,7 +68,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): return self.rv # add SELinux contexts when adding the first subsystem - if deployer.mdict['pki_subsystem'] in config.PKI_APACHE_SUBSYSTEMS and \ + if deployer.mdict['pki_subsystem'] in \ + config.PKI_APACHE_SUBSYSTEMS and \ deployer.instance.apache_instance_subsystems() == 1 \ or deployer.mdict['pki_subsystem'] in \ config.PKI_TOMCAT_SUBSYSTEMS and \ @@ -165,10 +166,12 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): while True: try: # remove SELinux contexts when removing the last subsystem - if (deployer.mdict['pki_subsystem'] in config.PKI_APACHE_SUBSYSTEMS and - deployer.instance.apache_instance_subsystems() == 0 or - deployer.mdict['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS and - len(deployer.instance.tomcat_instance_subsystems()) == 0): + if (deployer.mdict['pki_subsystem'] in + config.PKI_APACHE_SUBSYSTEMS and + deployer.instance.apache_instance_subsystems() == 0 or + deployer.mdict['pki_subsystem'] in + config.PKI_TOMCAT_SUBSYSTEMS and + len(deployer.instance.tomcat_instance_subsystems()) == 0): trans = seobject.semanageRecords("targeted") trans.start() |