mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
build: buildserverid must always be str not bytes
This commit is contained in:
parent
87524622ea
commit
c4dbc58d10
@ -78,9 +78,9 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
|
|||||||
if not buildserverid:
|
if not buildserverid:
|
||||||
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().decode()
|
||||||
logging.debug(_('Fetched buildserverid from VM: {buildserverid}')
|
logging.debug(_('Fetched buildserverid from VM: {buildserverid}')
|
||||||
.format(buildserverid=buildserverid.decode()))
|
.format(buildserverid=buildserverid))
|
||||||
|
|
||||||
# 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