chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8752462
)
build: buildserverid must always be str not bytes
author
Hans-Christoph Steiner
<hans@eds.org>
Thu, 11 Jan 2018 11:56:28 +0000
(12:56 +0100)
committer
Hans-Christoph Steiner
<hans@eds.org>
Thu, 11 Jan 2018 13:09:12 +0000
(14:09 +0100)
fdroidserver/build.py
patch
|
blob
|
history
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index 7e587c9b0d22c3af2a3e18366e3b479de706c708..464ccf1cd51c611132a08f2299b913be59f61fec 100644
(file)
--- a/
fdroidserver/build.py
+++ b/
fdroidserver/build.py
@@
-78,9
+78,9
@@
def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
if not buildserverid:
buildserverid = subprocess.check_output(['vagrant', 'ssh', '-c',
'cat /home/vagrant/buildserverid'],
- cwd='builder').rstrip()
+ cwd='builder').rstrip()
.decode()
logging.debug(_('Fetched buildserverid from VM: {buildserverid}')
- .format(buildserverid=buildserverid
.decode()
))
+ .format(buildserverid=buildserverid))
# Open SSH connection...
logging.info("Connecting to virtual machine...")