From 280b437572fb4ca7d2c3676e41c8fd6184f7bfa7 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Tue, 19 Dec 2023 18:13:34 +0100
Subject: [PATCH] image-customization: simplify return values
If we align the table keys of the selection table to match the return
object of get_selections, we can omit creating a new return object.
Signed-off-by: David Bauer <mail@david-bauer.net>
---
scripts/image_customization_lib.lua | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/scripts/image_customization_lib.lua b/scripts/image_customization_lib.lua
index 69c0b3830..64fc1aac8 100644
--- a/scripts/image_customization_lib.lua
+++ b/scripts/image_customization_lib.lua
@@ -15,8 +15,8 @@ end
local function evaluate_device(env, dev)
local selections = {
- feature = {},
- package = {},
+ features = {},
+ packages = {},
}
local funcs = {}
local device_overrides = {}
@@ -34,11 +34,11 @@ local function evaluate_device(env, dev)
end
function funcs.features(features)
- add_elements('feature', features)
+ add_elements('features', features)
end
function funcs.packages(packages)
- add_elements('package', packages)
+ add_elements('packages', packages)
end
function funcs.broken(broken)
@@ -115,12 +115,7 @@ function M.get_selections(env, dev)
end
local eval_result = evaluate_device(env, dev)
- return_object = {
- features = eval_result.selections['feature'],
- packages = eval_result.selections['package'],
- }
-
- return return_object
+ return eval_result.selections
end
function M.device_overrides(env, dev)
--
GitLab