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

Fix bug with upstart detection

Browse source 
Upstart scripts are being incorrectly identified as SysV init scripts
due to a logic error in the `service` module.

Because upstart uses multiple commands (`/sbin/start`, `/sbin/stop`,
etc.) for managing service state, the codepath for upstart sets
`self.svc_cmd` to an empty string on line 451.

Empty strings are considered a non-truthy value in Python, so
conditionals which are checking the state of `self.svc_cmd` should
explicitly compare it to `None` to avoid overlooking the fact that
the service may be controlled by an upstart script.
This commit is contained in:
David Wittman 2015-03-25 17:21:37 -05:00 committed by Matt Clay
parent 5faa882138
commit 15235a718d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/system/service.py
View file

@ -472,7 +472,7 @@ class LinuxService(Service):
self.module.fail_json(msg="no service or tool found for: %s" % self.name) self.module.fail_json(msg="no service or tool found for: %s" % self.name)
# If no service control tool selected yet, try to see if 'service' is available # If no service control tool selected yet, try to see if 'service' is available
if not self.svc_cmd and location.get('service', False): if self.svc_cmd is None and location.get('service', False):
self.svc_cmd = location['service'] self.svc_cmd = location['service']
# couldn't find anything yet # couldn't find anything yet