]> git.e2factory.org Git - e2factory.git/commitdiff
collect_project: in wc-mode, return a scratch buildid
authorTobias Ulmer <tu@emlix.com>
Fri, 7 Sep 2018 14:10:24 +0000 (16:10 +0200)
committerTobias Ulmer <tu@emlix.com>
Mon, 10 Dec 2018 17:00:11 +0000 (18:00 +0100)
Due to hashing the dependant results of a cp result, the scratch buildid
status was dropped from the buildid. Aside from an unlikely hash collision,
this does not affect other build modes, but is of course not correct.

Signed-off-by: Tobias Ulmer <tu@emlix.com>
plugins/collect_project.lua

index bcf57e19cfc7295ab910d2b22dd473e94ec38b60..a570e01547fd63117307f65ea804882c4a3b0b4f 100644 (file)
@@ -487,8 +487,7 @@ function collect_project_class:buildid(rbs)
     hash.hash_append(hc, bid)
 
     bid = hash.hash_finish(hc)
-
-    assertIsStringN(bid)
+    bid = rbs:build_mode().buildid(bid)
 
     e2lib.logf(4, "BUILDID: cp result=%s buildid=%s", self._name, bid)