diff options
| author | Noel Power <noel.power@suse.com> | 2018-11-24 15:27:21 +0000 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2018-12-10 10:38:24 +0100 |
| commit | a7cb10e4b475e0a41517f3e7be502be5e2ebb54e (patch) | |
| tree | 27e0ffc4f03eecae0ec2ad9f259f8d7ea6d6564e /buildtools | |
| parent | c316738f2652af8375e40b760d011a0e932a18ab (diff) | |
| download | samba-a7cb10e4b475e0a41517f3e7be502be5e2ebb54e.tar.gz | |
PY3 pure build fix some str/bytes wobblies
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_dist.py | 4 |
1 files changed, 2 insertions, 2 deletions
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=''): |