]> git.e2factory.org Git - e2factory.git/commitdiff
e2build: display longer more of the scratch buildid
authorTobias Ulmer <tu@emlix.com>
Fri, 7 Sep 2018 15:14:07 +0000 (17:14 +0200)
committerTobias Ulmer <tu@emlix.com>
Mon, 10 Dec 2018 17:00:11 +0000 (18:00 +0100)
local/e2build.lua

index fbb7518d63e54cb249cb45eb464edb0a6ee7ebb6..042420afea4857c8348edebd52baaf3e407417d1 100644 (file)
@@ -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,