]> git.e2factory.org Git - e2factory.git/commitdiff
result: move build_settings() implementation into result_class
authorTobias Ulmer <tu@emlix.com>
Fri, 21 Oct 2016 15:35:21 +0000 (17:35 +0200)
committerTobias Ulmer <tu@emlix.com>
Wed, 16 Nov 2016 14:41:18 +0000 (15:41 +0100)
Signed-off-by: Tobias Ulmer <tu@emlix.com>
local/result.lua

index ffd04ebe5bce4f45673abe3fc94814c54efca5ae..a34d23275d19fa74609b6fcf8c0ac5ad2faaff54 100644 (file)
@@ -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()