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

svc: Ensure python 2.5 compatibility

Browse source 
* eg. debian lenny
This commit is contained in:
Kai de Haan 2015-02-12 20:46:20 +01:00 committed by Matt Clay
parent 21a03152dc
commit 36fa3ccf6c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/extras/system/svc.py Normal file → Executable file
View file

@ -198,10 +198,12 @@ class Svc(object):
self.module.fail_json(msg="failed to execute: %s" % str(e)) self.module.fail_json(msg="failed to execute: %s" % str(e))
return (rc, out, err) return (rc, out, err)
def report(self): def report(self):
self.get_status() self.get_status()
return {k: self.__dict__[k] for k in self.report_vars} states = {}
for k in self.report_vars:
states[k] = self.__dict__[k]
return states
# =========================================== # ===========================================
# Main control flow # Main control flow
@ -236,7 +238,7 @@ def main():
svc.enable() svc.enable()
else: else:
svc.disable() svc.disable()
except (OSError, IOError) as e: except (OSError, IOError), e:
module.fail_json(msg="Could change service link: %s" % str(e)) module.fail_json(msg="Could change service link: %s" % str(e))
if state is not None and state != svc.state: if state is not None and state != svc.state:
@ -253,8 +255,8 @@ def main():
open(d_file, "a").close() open(d_file, "a").close()
else: else:
os.unlink(d_file) os.unlink(d_file)
except (OSError, IOError) as e: except (OSError, IOError), e:
module.fail_json(msg="Could change downed file: %s " % (str(e))) module.fail_json(msg="Could change downed file: %s " % (str(e)))
module.exit_json(changed=changed, svc=svc.report()) module.exit_json(changed=changed, svc=svc.report())