]> git.e2factory.org Git - e2factory.git/commitdiff
result: move build_mode implementation into result_class
authorTobias Ulmer <tu@emlix.com>
Fri, 21 Oct 2016 14:49:56 +0000 (16:49 +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 b6fd66b838f214bb3cd2ef590db409a369e02eee..ffd04ebe5bce4f45673abe3fc94814c54efca5ae 100644 (file)
@@ -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()