From 4422dca528abc5924b93b60cca7f8dd00a8731a2 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 15 Mar 2016 13:21:19 +0100 Subject: [PATCH] fix py3 bug when running `fdroid build` with a buildserver File "/var/lib/jenkins/workspace/fdroidserver-makebuildserver/fdroidserver/build.py", line 1119, in main options.onserver, options.refresh): File "/var/lib/jenkins/workspace/fdroidserver-makebuildserver/fdroidserver/build.py", line 954, in trybuild build_server(app, build, vcs, build_dir, output_dir, force) File "/var/lib/jenkins/workspace/fdroidserver-makebuildserver/fdroidserver/build.py", line 403, in build_server output += get TypeError: Can't convert 'bytes' object to str implicitly closes #164 https://gitlab.com/fdroid/fdroidserver/issues/164 --- fdroidserver/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index fe9d4b9f..b059124d 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -389,7 +389,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force): cmdline += ' --verbose' cmdline += " %s:%s" % (app.id, build.vercode) chan.exec_command('bash -c ". ~/.bsenv && ' + cmdline + '"') - output = '' + output = bytes() while not chan.exit_status_ready(): while chan.recv_ready(): output += chan.recv(1024) @@ -404,7 +404,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force): if returncode != 0: raise BuildException( "Build.py failed on server for {0}:{1}".format( - app.id, build.version), output) + app.id, build.version), str(output, 'utf-8')) # Retrieve the built files... logging.info("Retrieving build output...") -- 2.30.2