From f68b34c83461e61326b4f32c54975c7d40ed5f76 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Wed, 30 Jan 2013 20:55:57 +0100 Subject: [PATCH] Buildid change: stop indiscriminately hashing the "base" group Fixes a stacktrace when using a chroot config default group different to "base". This fix causes a buildid change, since the invalid base group was hashed into the result buildid. Signed-off-by: Tobias Ulmer --- local/e2tool.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/local/e2tool.lua b/local/e2tool.lua index 2667b21..7558589 100644 --- a/local/e2tool.lua +++ b/local/e2tool.lua @@ -407,7 +407,6 @@ local function check_collect_project(info, resultname) -- store a sorted list of required sources, chroot groups and licences local tmp_grp = {} local tmp_src = {} - tmp_grp["base"] = true for _,r in ipairs(res.collect_project_results) do local res = info.results[r] for _,s in ipairs(res.sources) do @@ -2122,11 +2121,7 @@ function e2tool.pbuildid(info, resultname) end hash.hash_line(hc, lid) -- licence id end - local groupid, re = chrootgroupid(info, "base") - if not groupid then - return nil, e:cat(re) - end - hc:hash_line(groupid) + if r.chroot then for _,g in ipairs(r.chroot) do local groupid = chrootgroupid(info, g) -- 2.39.5