internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround python-libselinux API change (#25685)

Browse Source 
In the past, selinux.security_get_boolean_names did return 'bytes'
on python 3, but this was changed to return string later, cf:
b8711e2eaf

So we have to convert to bytes only if the API return us bytes.

Fix #25651
This commit is contained in:
Michael Scherer
2017-07-21 19:14:22 +02:00
committed by Toshio Kuratomi
parent ede82e2130
commit e2d6ecfa40
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/modules/system/seboolean.py
View File

@@ -79,7 +79,12 @@ def has_boolean_value(module, name):
rc, bools = selinux.security_get_boolean_names() rc, bools = selinux.security_get_boolean_names()
except OSError: except OSError:
module.fail_json(msg="Failed to get list of boolean names") module.fail_json(msg="Failed to get list of boolean names")
if to_bytes(name) in bools: # work around for selinux who changed its API, see
# https://github.com/ansible/ansible/issues/25651
if len(bools) > 0:
if isinstance(bools[0], binary_type):
name = to_bytes(name)
if name in bools:
return True return True
else: else:
return False return False
@@ -224,6 +229,7 @@ def main():
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils._text import to_bytes from ansible.module_utils._text import to_bytes
from ansible.module_utils.six import binary_type
if __name__ == '__main__': if __name__ == '__main__':
main() main()