From d7e6e335f3b063399bfa3fe7e11f746cf86a56fc Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Sat, 18 Jun 2016 12:10:36 +0100 Subject: [PATCH] Fix buildserver, broken by e449d2f 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?) --- fdroidserver/build.py | 1 + 1 file changed, 1 insertion(+) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 8376cadf..7709a6bf 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -388,6 +388,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force): if options.verbose: cmdline += ' --verbose' cmdline += " %s:%s" % (app.id, build.vercode) + cmdline = '. /etc/profile && ' + cmdline chan.exec_command('bash -c "' + cmdline + '"') output = bytes() while not chan.exit_status_ready():