From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Tue, 11 Dec 2018 21:17:38 +0000 (+1300)
Subject: autobuild: py3: cope with bytes when compiling system-info.txt
X-Git-Tag: tdb-1.3.17~366
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25ab429371f7cd4d4cd572d843d3607f2ce1db6f;p=thirdparty%2Fsamba.git

autobuild: py3: cope with bytes when compiling system-info.txt

The command output looks like b'foo\nbar' in string-space.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/script/autobuild.py b/script/autobuild.py
index c71b85a85b4..f26a5b2095e 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -608,10 +608,15 @@ class buildlist(object):
     def write_system_info(self):
         filename = 'system-info.txt'
         f = open(filename, 'w')
-        for cmd in ['uname -a', 'free', 'cat /proc/cpuinfo',
-                    'cc --version', 'df -m .', 'df -m %s' % testbase]:
+        for cmd in ['uname -a',
+                    'free',
+                    'cat /proc/cpuinfo',
+                    'cc --version',
+                    'df -m .',
+                    'df -m %s' % testbase]:
+            out = run_cmd(cmd, output=True, checkfail=False)
             print('### %s' % cmd, file=f)
-            print(run_cmd(cmd, output=True, checkfail=False), file=f)
+            print(out.decode('utf8', 'backslashreplace'), file=f)
             print(file=f)
         f.close()
         return filename