From: Tobias Ulmer <tu@emlix.com>
Date: Thu, 8 Sep 2016 14:47:12 +0000 (+0200)
Subject: result: modify build_mode() and drop the getter/setter style
X-Git-Tag: e2factory-2.3.15rc1~121
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=4e0a8c33a55773ae5659c3da2fa23f837c832c4b;p=e2factory.git

result: modify build_mode() and drop the getter/setter style

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/local/result.lua b/local/result.lua
index 39a399d..6013e5c 100644
--- a/local/result.lua
+++ b/local/result.lua
@@ -179,19 +179,17 @@ function result.basic_result:buildconfig()
     return strict.readonly(bc)
 end
 
---- Set build_mode table for result:
--- @param build_mode Build mode table
-function result.basic_result:set_build_mode(build_mode)
-    assertIsTable(build_mode)
-    assertIsNil(self.build_mode)
-    self._build_mode = build_mode
-end
-
-function result.basic_result:get_build_mode()
-    assertIsTable(self._build_mode)
-    assertIsNil(self.build_mode)
+--- 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.
+function result.basic_result:build_mode(bm)
+    if bm then
+        assertIsTable(bm)
+        self._build_mode = bm
+    else
+        assertIsTable(self._build_mode)
+    end
 
-    -- XXX: comments for buildconfig() apply
     return self._build_mode
 end
 
@@ -451,7 +449,7 @@ end
 -- @return Error object on failure.
 function result.result_class:buildid()
     local e, rc, re, info, hc, id, build_mode
-    build_mode = self:get_build_mode()
+    build_mode = self:build_mode()
 
     if self._buildid then
         return build_mode.buildid(self._buildid)