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

Make the flatpak module work with Python 3.

Browse source 
Fixes #46994
Fixes #46995
This commit is contained in:
Matthias Fuchs 2018-11-03 21:58:03 +01:00 committed by Brian Coca
parent 90ea6c8d12
commit 7e8d9081a7
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/modules/packaging/os/flatpak.py
View file

@ -127,6 +127,7 @@ stdout:
import subprocess
from ansible.module_utils.six.moves.urllib.parse import urlparse
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_native
def install_flat(module, binary, remote, name, method):
@ -203,7 +204,7 @@ def _flatpak_command(module, noop, command):
result['stderr'] = stderr_data
if result['rc'] != 0:
module.fail_json(msg="Failed to execute flatpak command", **result)
return stdout_data
return to_native(stdout_data)
def main():

5
lib/ansible/modules/packaging/os/flatpak_remote.py
View file

@ -120,6 +120,7 @@ stdout:
import subprocess
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_bytes, to_native
def add_remote(module, binary, name, flatpakrepo_url, method):
@ -168,7 +169,7 @@ def _flatpak_command(module, noop, command):
result['stderr'] = stderr_data
if result['rc'] != 0:
module.fail_json(msg="Failed to execute flatpak command", **result)
return stdout_data
return to_native(stdout_data)
def main():
@ -205,7 +206,7 @@ def main():
if not binary:
module.fail_json(msg="Executable '%s' was not found on the system." % executable, **result)
remote_already_exists = remote_exists(module, binary, bytes(name, 'utf-8'), method)
remote_already_exists = remote_exists(module, binary, to_bytes(name), method)
if state == 'present' and not remote_already_exists:
add_remote(module, binary, name, flatpakrepo_url, method)