mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: buildserverid must always be str not bytes

Browse source
This commit is contained in:
Hans-Christoph Steiner 2018-01-11 12:56:28 +01:00
parent 87524622ea
commit c4dbc58d10
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/build.py
View file

@ -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...")