From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 7 Nov 2016 14:36:16 +0000 (+0100)
Subject: include version, commit, and android tools versions in local log
X-Git-Tag: 0.8~145^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3fb4cba178167c97ef11c100d5422a3ec857adb7;p=fdroidserver.git

include version, commit, and android tools versions in local log

This includes more info to help track down problems with reproducible
builds, like the specific version being built, and which exact versions of
the Android SDK and NDK were used.
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 75539a28..5aa2d7c6 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -1186,6 +1186,12 @@ def main():
                 wikilog = str(vcse)
             except FDroidException as e:
                 with open(os.path.join(log_dir, appid + '.log'), 'a+') as f:
+                    f.write('\n\n============================================================\n')
+                    f.write('versionCode: %s\nversionName: %s\ncommit: %s\n' %
+                            (build.vercode, build.version, build.commit))
+                    f.write('Build completed at '
+                            + time.strftime("%Y-%m-%d %H:%M:%SZ", time.gmtime()) + '\n')
+                    f.write('\n' + tools_version_log + '\n')
                     f.write(str(e))
                 logging.error("Could not build app %s: %s" % (appid, e))
                 if options.stop: