mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
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
This commit is contained in:
parent
3a792a8c3d
commit
87524622ea
@ -79,7 +79,8 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
|
|||||||
buildserverid = subprocess.check_output(['vagrant', 'ssh', '-c',
|
buildserverid = subprocess.check_output(['vagrant', 'ssh', '-c',
|
||||||
'cat /home/vagrant/buildserverid'],
|
'cat /home/vagrant/buildserverid'],
|
||||||
cwd='builder').rstrip()
|
cwd='builder').rstrip()
|
||||||
logging.debug(_('Fetched buildserverid from VM: ') + buildserverid)
|
logging.debug(_('Fetched buildserverid from VM: {buildserverid}')
|
||||||
|
.format(buildserverid=buildserverid.decode()))
|
||||||
|
|
||||||
# Open SSH connection...
|
# Open SSH connection...
|
||||||
logging.info("Connecting to virtual machine...")
|
logging.info("Connecting to virtual machine...")
|
||||||
|
Loading…
Reference in New Issue
Block a user