mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 23:12:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix buildserver, broken by e449d2f

Browse source 
Switching to a script /etc/profile.d to set up the environment is all
well and good, except that doesn't get run when you directly execute a
command directly via ssh, which means that the buildserver didn't work
at all (at least for anything that used gradle, or relied on the
environment variables.

This fix doesn't look very nice, but it works - it just forces the
appropriate script to run before build.py is executed on the server.

(Side note, I thought we had tests for this, how did it get past them?)
This commit is contained in:
Ciaran Gultnieks 2016-06-18 12:10:36 +01:00
parent d6ab05c567
commit d7e6e335f3
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
fdroidserver/build.py
View file

@ -388,6 +388,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force):
if options.verbose: if options.verbose:
cmdline += ' --verbose' cmdline += ' --verbose'
cmdline += " %s:%s" % (app.id, build.vercode) cmdline += " %s:%s" % (app.id, build.vercode)
cmdline = '. /etc/profile && ' + cmdline
chan.exec_command('bash -c "' + cmdline + '"') chan.exec_command('bash -c "' + cmdline + '"')
output = bytes() output = bytes()
while not chan.exit_status_ready(): while not chan.exit_status_ready():