From 8b6ded5bbe65f9f46864132a9b6b359850556ba3 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Fri, 21 Oct 2016 16:49:56 +0200 Subject: [PATCH] result: move build_mode implementation into result_class Signed-off-by: Tobias Ulmer --- local/result.lua | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/local/result.lua b/local/result.lua index b6fd66b..ffd04eb 100644 --- a/local/result.lua +++ b/local/result.lua @@ -65,11 +65,6 @@ function result.basic_result:initialize(rawres) self._name = rawres.name self._type = rawres.type - - -- - -- e2build currently needs this stuff in every result. - -- - self._build_mode = false end --- Constructor that's called by load_result_configs() after all results @@ -143,15 +138,10 @@ end --- Get/set build_mode table for result. Needs to be set before certain -- operations, for example anything calculating the buildid. -- @param bm Optional build mode table to set a new one. +-- @see policy.build_mode function result.basic_result:build_mode(bm) - if bm then - assertIsTable(bm) - self._build_mode = bm - else - assertIsTable(self._build_mode) - end - - return self._build_mode + error(err.new("called build_mode() of result base class, type %s name %s", + self._type, self._name)) end --- Return the complete and merged environment for this result. @@ -218,6 +208,7 @@ function result.result_class:initialize(rawres) self._sources_list = sl.sl:new(false, true) self._chroot_list = sl.sl:new(false, true) self._env = environment.new() + self._build_mode = false local e = err.new("in result %s:", self._name) local rc, re, info @@ -430,6 +421,17 @@ function result.result_class:build_config() return strict.readonly(bc) end +function result.result_class:build_mode(bm) + if bm then + assertIsTable(bm) + self._build_mode = bm + else + assertIsTable(self._build_mode) + end + + return self._build_mode +end + function result.result_class:merged_env() local e = environment.new() -- 2.39.5