Upstart, how do I love thee. Let me count the ways. 0.

This commit is contained in:
Michael DeHaan 2013-04-28 09:29:31 -04:00
parent ca590b494b
commit 73d2a38e3a

12
service
View file

@ -907,10 +907,16 @@ def main():
(rc, out, err) = service.modify_service_state() (rc, out, err) = service.modify_service_state()
if rc != 0: if rc != 0:
if err: if err and err.find("is already") != -1:
module.fail_json(msg=err) # upstart got confused, one such possibility is MySQL on Ubuntu 12.04
# where status may report it has no start/stop links and we could
# not get accurate status
pass
else: else:
module.fail_json(msg=out) if err:
module.fail_json(msg=err)
else:
module.fail_json(msg=out)
result['changed'] = service.changed result['changed'] = service.changed
if service.module.params['enabled'] is not None: if service.module.params['enabled'] is not None: