cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1279 from no2a/devel

Browse source 
Not use "is" to compare strings
This commit is contained in:
Brian Coca 2015-07-04 16:00:05 -04:00
commit 03d4805074
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
system/service.py
View file

@ -885,7 +885,7 @@ class LinuxService(Service):
if self.svc_cmd and self.svc_cmd.endswith('rc-service') and self.action == 'start' and self.crashed: if self.svc_cmd and self.svc_cmd.endswith('rc-service') and self.action == 'start' and self.crashed:
self.execute_command("%s zap" % svc_cmd, daemonize=True) self.execute_command("%s zap" % svc_cmd, daemonize=True)
if self.action is not "restart": if self.action != "restart":
if svc_cmd != '': if svc_cmd != '':
# upstart or systemd or OpenRC # upstart or systemd or OpenRC
rc_state, stdout, stderr = self.execute_command("%s %s %s" % (svc_cmd, self.action, arguments), daemonize=True) rc_state, stdout, stderr = self.execute_command("%s %s %s" % (svc_cmd, self.action, arguments), daemonize=True)
@ -993,11 +993,11 @@ class FreeBsdService(Service):
def service_control(self): def service_control(self):
if self.action is "start": if self.action == "start":
self.action = "onestart" self.action = "onestart"
if self.action is "stop": if self.action == "stop":
self.action = "onestop" self.action = "onestop"
if self.action is "reload": if self.action == "reload":
self.action = "onereload" self.action = "onereload"
return self.execute_command("%s %s %s %s" % (self.svc_cmd, self.name, self.action, self.arguments)) return self.execute_command("%s %s %s %s" % (self.svc_cmd, self.name, self.action, self.arguments))
@ -1203,9 +1203,9 @@ class NetBsdService(Service):
self.running = True self.running = True
def service_control(self): def service_control(self):
if self.action is "start": if self.action == "start":
self.action = "onestart" self.action = "onestart"
if self.action is "stop": if self.action == "stop":
self.action = "onestop" self.action = "onestop"
self.svc_cmd = "%s" % self.svc_initscript self.svc_cmd = "%s" % self.svc_initscript