From b4dd0b8d0317216896f3a3beef23f3ba75ee524f Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Fri, 21 Oct 2016 17:35:21 +0200 Subject: [PATCH] result: move build_settings() implementation into result_class Signed-off-by: Tobias Ulmer --- local/result.lua | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/local/result.lua b/local/result.lua index ffd04eb..a34d232 100644 --- a/local/result.lua +++ b/local/result.lua @@ -162,14 +162,8 @@ end -- a valid settings_class -- @param bs Optional settings_class function result.basic_result:build_settings(bs) - if bs then - assertIsTable(bs) - self._build_settings = bs - else - assertIsTable(self._build_settings) - end - - return self._build_settings + error(err.new("called build_settings() of result base class, type %s name %s", + self._type, self._name)) end --- Textual free-form representation of the result. @@ -209,6 +203,7 @@ function result.result_class:initialize(rawres) self._chroot_list = sl.sl:new(false, true) self._env = environment.new() self._build_mode = false + self._build_settings = false local e = err.new("in result %s:", self._name) local rc, re, info @@ -432,6 +427,17 @@ function result.result_class:build_mode(bm) return self._build_mode end +function result.result_class:build_settings(bs) + if bs then + assertIsTable(bs) + self._build_settings = bs + else + assertIsTable(self._build_settings) + end + + return self._build_settings +end + function result.result_class:merged_env() local e = environment.new() -- 2.39.5