From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 9 Feb 2017 22:48:40 +0000 (+0100)
Subject: log Android SDK/NDK component versions on buildserver
X-Git-Tag: 0.8~127^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=57c3ba413c012cfd8990d10a861f6f14adcc204b;p=fdroidserver.git

log Android SDK/NDK component versions on buildserver

ad2b9b99c2a7084e1ef4df06d635c7b63bee89e3 put this in the wrong place, it
was running it on the buildserver host rather than in the buildserver VM
itself, where the builds actually run.

refs #148
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 736e7ebe..f353bd15 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -389,7 +389,10 @@ def build_server(app, build, vcs, build_dir, output_dir, force):
             cmdline += ' --verbose'
         cmdline += " %s:%s" % (app.id, build.vercode)
         chan.exec_command('bash --login -c "' + cmdline + '"')
+
         output = bytes()
+        output += b'== Installed Android Tools ==\n\n'
+        output += get_android_tools_version_log(build.ndk_path()).encode()
         while not chan.exit_status_ready():
             while chan.recv_ready():
                 output += chan.recv(1024)
@@ -952,9 +955,11 @@ def trybuild(app, build, build_dir, output_dir, also_check_dir, srclib_dir, extl
     return True
 
 
-def get_android_tools_versions(sdk_path, ndk_path=None):
+def get_android_tools_versions(ndk_path=None):
     '''get a list of the versions of all installed Android SDK/NDK components'''
 
+    global config
+    sdk_path = config['sdk_path']
     if sdk_path[-1] != '/':
         sdk_path += '/'
     components = []
@@ -976,10 +981,10 @@ def get_android_tools_versions(sdk_path, ndk_path=None):
     return components
 
 
-def get_android_tools_version_log(sdk_path, ndk_path):
+def get_android_tools_version_log(ndk_path):
     '''get a list of the versions of all installed Android SDK/NDK components'''
     log = ''
-    components = get_android_tools_versions(sdk_path, ndk_path)
+    components = get_android_tools_versions(ndk_path)
     for name, version in sorted(components):
         log += '* ' + name + ' (' + version + ')\n'
 
@@ -1137,7 +1142,7 @@ def main():
         for build in app.builds:
             wikilog = None
             tools_version_log = '== Installed Android Tools ==\n\n'
-            tools_version_log += get_android_tools_version_log(config['sdk_path'], build.ndk_path())
+            tools_version_log += get_android_tools_version_log(build.ndk_path())
             try:
 
                 # For the first build of a particular app, we need to set up