From: Noel Power Date: Sat, 24 Nov 2018 15:27:21 +0000 (+0000) Subject: PY3 pure build fix some str/bytes wobblies X-Git-Tag: tdb-1.3.17~413 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7cb10e4b475e0a41517f3e7be502be5e2ebb54e;p=thirdparty%2Fsamba.git PY3 pure build fix some str/bytes wobblies Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py index 0568403aa44..c3144e9adf7 100644 --- a/buildtools/wafsamba/samba_dist.py +++ b/buildtools/wafsamba/samba_dist.py @@ -97,7 +97,7 @@ def add_tarfile(tar, fname, abspath, basedir): tinfo.gid = 0 tinfo.uname = 'root' tinfo.gname = 'root' - fh = open(abspath) + fh = open(abspath, "rb") tar.addfile(tinfo, fileobj=fh) fh.close() @@ -119,7 +119,7 @@ def vcs_dir_contents(path): repo = os.path.dirname(repo) if repo == "/": raise Exception("unsupported or no vcs for %s" % path) - return Utils.cmd_output(ls_files_cmd, cwd=cwd, env=env).split('\n') + return Utils.cmd_output(ls_files_cmd, cwd=cwd, env=env).decode('utf8').split('\n') def dist(appname='', version=''):