From 40cd51ed5906e9c3bac8253283cb1ac805d15963 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 23 Jul 2020 13:03:51 +0200
Subject: [PATCH] build: include commit ID in build log

---
 fdroidserver/build.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index a4fe326b..ea5e1420 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -684,9 +684,17 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
 
         bindir = os.path.join(root_dir, 'bin')
 
+    if os.path.isdir(os.path.join(build_dir, '.git')):
+        import git
+        commit_id = common.get_head_commit_id(git.repo.Repo(build_dir))
+    else:
+        commit_id = build.commit
+
     if p is not None and p.returncode != 0:
-        raise BuildException("Build failed for %s:%s" % (app.id, build.versionName), p.output)
-    logging.info("Successfully built version " + build.versionName + ' of ' + app.id)
+        raise BuildException("Build failed for %s:%s@%s" % (app.id, build.versionName, commit_id),
+                             p.output)
+    logging.info("Successfully built version {versionName} of {appid} from {commit_id}"
+                 .format(versionName=build.versionName, appid=app.id, commit_id=commit_id))
 
     omethod = build.output_method()
     if omethod == 'maven':