From: Hans-Christoph Steiner Date: Thu, 11 Jan 2018 11:28:49 +0000 (+0100) Subject: build: fix str vs. bytes error in buildserverid X-Git-Tag: 1.0.1~43 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=87524622ea1be2c66539c2e84c54295ac29edc97;p=fdroidserver.git build: fix str vs. bytes error in buildserverid ERROR: Could not build app org.fdroid.fdroid due to unknown error: Traceback (most recent call last): File "/var/lib/jenkins/userContent/reproducible/reproducible_setup_fdroid_build_environment/fdroidserver/build.py", line 1202, in main options.onserver, options.refresh): File "/var/lib/jenkins/userContent/reproducible/reproducible_setup_fdroid_build_environment/fdroidserver/build.py", line 972, in trybuild build_server(app, build, vcs, build_dir, output_dir, log_dir, force) File "/var/lib/jenkins/userContent/reproducible/reproducible_setup_fdroid_build_environment/fdroidserver/build.py", line 82, in build_server logging.debug(_('Fetched buildserverid from VM: ') + buildserverid) TypeError: Can't convert 'bytes' object to str implicitly --- diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 39bde47b..7e587c9b 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -79,7 +79,8 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force): buildserverid = subprocess.check_output(['vagrant', 'ssh', '-c', 'cat /home/vagrant/buildserverid'], cwd='builder').rstrip() - logging.debug(_('Fetched buildserverid from VM: ') + buildserverid) + logging.debug(_('Fetched buildserverid from VM: {buildserverid}') + .format(buildserverid=buildserverid.decode())) # Open SSH connection... logging.info("Connecting to virtual machine...")