ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-16 20:08:41 +00:00
Code Packages Projects Releases Wiki Activity

Fix warning/error extraction. (#305)

Browse Source
This commit is contained in:
Felix Fontein 2022-03-14 21:01:35 +01:00 committed by GitHub
parent 48391d6755
commit ba5e6f89f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/305-docker_compose-errors-warnings.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- "docker_compose - fix Python 3 type error when extracting warnings or errors from docker-compose's output (https://github.com/ansible-collections/community.docker/pull/305)."

4
plugins/modules/docker_compose.py
View File

@ -587,8 +587,8 @@ def attempt_extract_errors(exc_str, stdout, stderr):
msg = 'unknown cause' msg = 'unknown cause'
return { return {
'warnings': [w.encode('utf-8') for w in warnings], 'warnings': [to_native(w) for w in warnings],
'errors': [e.encode('utf-8') for e in errors], 'errors': [to_native(e) for e in errors],
'msg': msg, 'msg': msg,
'module_stderr': ''.join(stderr), 'module_stderr': ''.join(stderr),
'module_stdout': ''.join(stdout) 'module_stdout': ''.join(stdout)