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

Merge pull request #844 from bcoca/seport_24

Browse source 
made seport 2.4 compatible
This commit is contained in:
Brian Coca 2015-08-17 12:21:39 -04:00
commit 29383c3e8c
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
system/seport.py
View file

@ -141,15 +141,15 @@ def semanage_port_add(module, ports, proto, setype, do_reload, serange='s0', ses
seport.add(port, proto, serange, setype) seport.add(port, proto, serange, setype)
change = change or not exists change = change or not exists
except ValueError as e: except ValueError, e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
except IOError as e: except IOError, e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
except KeyError as e: except KeyError, e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
except OSError as e: except OSError, e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
except RuntimeError as e: except RuntimeError, e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
return change return change
@ -186,15 +186,15 @@ def semanage_port_del(module, ports, proto, do_reload, sestore=''):
seport.delete(port, proto) seport.delete(port, proto)
change = change or not exists change = change or not exists
except ValueError as e: except ValueError, e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
except IOError as e: except IOError,e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
except KeyError as e: except KeyError, e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
except OSError as e: except OSError, e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
except RuntimeError as e: except RuntimeError, e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e)))
return change return change