From d7976ce08eb6b1b4f23a09439ba5df545b1fb4a0 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Thu, 8 Sep 2016 15:24:33 +0200 Subject: [PATCH] result: move my_chroot_list() implementation up into the descendent class Signed-off-by: Tobias Ulmer --- local/result.lua | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/local/result.lua b/local/result.lua index 5b8a406..f150353 100644 --- a/local/result.lua +++ b/local/result.lua @@ -68,7 +68,6 @@ function result.basic_result:initialize(rawres) -- self._build_mode = false self._build_process = false - self._chroot_list = sl.sl:new(false, true) end --- Constructor that's called by load_result_configs() after all results @@ -139,6 +138,13 @@ function result.basic_result:merged_env() self._type, self._name)) end +--- Return the list of chroot groups for this result. +-- @return string list of required chroot groups. +function result.basic_result:my_chroot_list() + error(err.new("called my_chroot_list() of result base class, type %s name %s", + self._type, self._name)) +end + --- Return locked buildconfig table -- XXX: This is more like "chroot-config" -- @return buildconfig table (locked) or false on error @@ -212,12 +218,6 @@ function result.basic_result:merged_env() self._type, self._name)) end ---- Return the list of chroot groups for this result. --- @return string list of required chroot groups. -function result.basic_result:my_chroot_list() - return self._chroot_list -end - --- Get/set the settings class. Settings hold per-result information -- for the build process. Each result that's passed to a build process needs -- a valid settings_class @@ -267,6 +267,7 @@ function result.result_class:initialize(rawres) self.XXXdepends = sl.sl:new(false, true) self._buildid = false self._sources_list = sl.sl:new(false, true) + self._chroot_list = sl.sl:new(false, true) self._env = environment.new() local e = err.new("in result %s:", self._name) @@ -430,6 +431,10 @@ function result.result_class:my_sources_list() return self._sources_list end +function result.result_class:my_chroot_list() + return self._chroot_list +end + function result.result_class:merged_env() local e = environment.new() -- 2.39.5