From 0118412967778bf8cb4553f26deba990a9228325 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Fri, 27 Jan 2017 15:16:32 +0100 Subject: [PATCH] collect_project: include default_result and its deps in BuildID Signed-off-by: Tobias Ulmer --- Changelog | 1 + plugins/collect_project.lua | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 40a7d9e..20caa18 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ NEXT: + * Fix collect_project, include default result and its deps into the BuildID e2factory-2.3.16 * Fix e2 fetch-sources --update for git repos diff --git a/plugins/collect_project.lua b/plugins/collect_project.lua index 441bdee..2d5f70d 100644 --- a/plugins/collect_project.lua +++ b/plugins/collect_project.lua @@ -452,7 +452,7 @@ function collect_project_class:depends_list() end function collect_project_class:buildid() - local rc, re, bid, hc + local rc, re, bid, hc, res bid, re = self._stdresult:buildid() if not bid then @@ -461,7 +461,14 @@ function collect_project_class:buildid() hc = hash.hash_start() hash.hash_append(hc, bid) - hash.hash_append(hc, self:cp_default_result()) + + res = result.results[self:cp_default_result()] + bid, re = res:buildid() + if not bid then + return false, re + end + hash.hash_append(hc, bid) + bid = hash.hash_finish(hc) assertIsStringN(bid) -- 2.39.5