From: Noel Power <noel.power@suse.com>
Date: Sun, 25 Nov 2018 00:59:04 +0000 (+0000)
Subject: buildtools/wafsamba: Decode result of Popen as unicode/string
X-Git-Tag: tdb-1.3.17~411
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eb7281ff369e36abf466066d403c48082fdb80d;p=thirdparty%2Fsamba.git

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>
---

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