From: Tobias Ulmer Date: Fri, 7 Sep 2018 14:10:24 +0000 (+0200) Subject: collect_project: in wc-mode, return a scratch buildid X-Git-Tag: e2factory-2.3.18rc1~79 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=e9605e6462918156875bcca227f5cea15d31ad57;p=e2factory.git collect_project: in wc-mode, return a scratch buildid 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 --- diff --git a/plugins/collect_project.lua b/plugins/collect_project.lua index bcf57e1..a570e01 100644 --- a/plugins/collect_project.lua +++ b/plugins/collect_project.lua @@ -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)