summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2018-11-25 00:59:04 +0000
committerNoel Power <npower@samba.org>2018-12-10 10:38:25 +0100
commit3eb7281ff369e36abf466066d403c48082fdb80d (patch)
treea8d12ab7f1efabfdb155da67056573cc0ed3afc3 /buildtools
parent447276e2974ae5288eaf5dbe448bf52b27ec0839 (diff)
downloadsamba-3eb7281ff369e36abf466066d403c48082fdb80d.tar.gz
buildtools/wafsamba: Decode result of Popen as unicode/string
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_cross.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
index eee31179fed..f9c4b10e82b 100644
--- a/buildtools/wafsamba/samba_cross.py
+++ b/buildtools/wafsamba/samba_cross.py
@@ -121,7 +121,7 @@ class cross_Popen(Utils.subprocess.Popen):
stdout=Utils.subprocess.PIPE,
stderr=Utils.subprocess.PIPE)
ce_out, ce_err = p.communicate()
- ans = (p.returncode, ce_out)
+ ans = (p.returncode, ce_out.decode('utf8'))
add_answer(ca_file, msg, ans)
else:
args = newargs