From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 7 Sep 2018 15:14:07 +0000 (+0200)
Subject: e2build: display longer more of the scratch buildid
X-Git-Tag: e2factory-2.3.18rc1~78
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=a6700e0c3e3cb090ff47bb30bae41662424f41b4;p=e2factory.git

e2build: display longer more of the scratch buildid
---

diff --git a/local/e2build.lua b/local/e2build.lua
index fbb7518..042420a 100644
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -296,7 +296,14 @@ function e2build.build_process_class:_result_available(res, rbs)
         return false, e:cat(re)
     end
 
-    sbid = string.format("%s...", string.sub(buildid, 1, 8))
+    if rbs:build_mode().source_set() == "working-copy" then
+        assert(#buildid == digest.SHA1_LEN + 8 and
+            string.sub(buildid, 1, 8) == "scratch-")
+        sbid = string.format("%s...", string.sub(buildid, 1, 16))
+    else
+        assert(#buildid == digest.SHA1_LEN)
+        sbid = string.format("%s...", string.sub(buildid, 1, 8))
+    end
 
     if rbs:build_settings():prep_playground() then
         rbs:message(e2lib.align(columns,