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

Merge pull request #253 from SkaveRat/devel

Browse source 
svc: Ensure python 2.5 compatibility
This commit is contained in:
Brian Coca 2015-02-12 15:28:53 -05:00
commit 045a0b86cb
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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))
return (rc, out, err)
def report(self):
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
@ -236,7 +238,7 @@ def main():
svc.enable()
else:
svc.disable()
except (OSError, IOError) as e:
except (OSError, IOError), e:
module.fail_json(msg="Could change service link: %s" % str(e))
if state is not None and state != svc.state:
@ -253,8 +255,8 @@ def main():
open(d_file, "a").close()
else:
os.unlink(d_file)
except (OSError, IOError) as e:
module.fail_json(msg="Could change downed file: %s " % (str(e)))
except (OSError, IOError), e:
module.fail_json(msg="Could change downed file: %s " % (str(e)))
module.exit_json(changed=changed, svc=svc.report())