mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Python3 fix: Decode output from popen in iocage connection (#41868)
* decode output from popen in iocage connection * use ansibles to_native instead of stdlibs decode
This commit is contained in:
parent
134b77961b
commit
c34f85c788
1 changed files with 9 additions and 1 deletions
|
@ -32,8 +32,9 @@ DOCUMENTATION = """
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import subprocess
|
import subprocess
|
||||||
from ansible.plugins.connection.jail import Connection as Jail
|
|
||||||
|
|
||||||
|
from ansible.plugins.connection.jail import Connection as Jail
|
||||||
|
from ansible.module_utils._text import to_native
|
||||||
from ansible.errors import AnsibleError
|
from ansible.errors import AnsibleError
|
||||||
from ansible.utils.display import Display
|
from ansible.utils.display import Display
|
||||||
|
|
||||||
|
@ -67,6 +68,13 @@ class Connection(Jail):
|
||||||
stderr=subprocess.STDOUT)
|
stderr=subprocess.STDOUT)
|
||||||
|
|
||||||
stdout, stderr = p.communicate()
|
stdout, stderr = p.communicate()
|
||||||
|
|
||||||
|
if stdout is not None:
|
||||||
|
stdout = to_native(stdout)
|
||||||
|
|
||||||
|
if stderr is not None:
|
||||||
|
stderr = to_native(stderr)
|
||||||
|
|
||||||
# otherwise p.returncode would not be set
|
# otherwise p.returncode would not be set
|
||||||
p.wait()
|
p.wait()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue