summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Tools/__init__.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2015-02-17 08:55:23 -0600
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2015-02-17 09:05:10 -0600
commit6491d368d40f3de7d6c49b69b782497151d050a5 (patch)
treefff48c07ef6ff75b4e27e717cf12e3574f60db35 /src/lib/Bcfg2/Client/Tools/__init__.py
parentf4d30301fd4b7dca4375875aedae59e5c3542a34 (diff)
downloadbcfg2-6491d368d40f3de7d6c49b69b782497151d050a5.tar.gz
bcfg2-6491d368d40f3de7d6c49b69b782497151d050a5.tar.bz2
bcfg2-6491d368d40f3de7d6c49b69b782497151d050a5.zip
Pylint fixes for pylint 0.28
This also pins Pylint to 0.28 or older so that we don't have to do this again. At some point we should look at upgrading to Pylint 1.x.
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/__init__.py')
-rw-r--r--src/lib/Bcfg2/Client/Tools/__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index 67cdd4d6d..aaadc1428 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -573,7 +573,7 @@ class SvcTool(Tool):
return self.cmd.run(self.get_svc_command(service, 'stop'))
def restart_service(self, service):
- """ Restart a service.
+ """Restart a service.
:param service: The service entry to modify
:type service: lxml.etree._Element
@@ -606,15 +606,15 @@ class SvcTool(Tool):
return
for entry in bundle:
- if (not self.handlesEntry(entry)
- or not self._install_allowed(entry)):
+ if (not self.handlesEntry(entry) or
+ not self._install_allowed(entry)):
continue
estatus = entry.get('status')
restart = entry.get("restart", "true").lower()
if (restart == "false" or estatus == 'ignore' or
- (restart == "interactive" and
- not Bcfg2.Options.setup.interactive)):
+ (restart == "interactive" and
+ not Bcfg2.Options.setup.interactive)):
continue
success = False