From: Tobias Ulmer <tu@emlix.com>
Date: Wed, 8 Jan 2014 19:11:29 +0000 (+0100)
Subject: Remove select_result() and merge code with select_results()
X-Git-Tag: e2factory-2.3.15rc1~272
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=dc1e4bfb0910e25592a0e94645965c9b7e57443b;p=e2factory.git

Remove select_result() and merge code with select_results()

No functional change.

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

diff --git a/local/e2tool.lua b/local/e2tool.lua
index fd16afd..3ac9781 100644
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -2248,37 +2248,6 @@ function e2tool.env_by_result(info, resultname)
     return env
 end
 
---- select the result and apply build options
--- @param info
--- @param r string: the result name
--- @param force_rebuild bool
--- @param keep_chroot bool
--- @param build_mode table: build mode policy
--- @param playground bool
--- @return True on success, false on error.
--- @return Error object on failure.
-local function select_result(info, r, force_rebuild, keep_chroot, build_mode, playground)
-    local rc, re = e2tool.verify_src_res_name_valid_chars(r)
-    if not rc then
-        return false, err.new("'%s' is not a valid result name", r)
-    end
-
-    local res = info.results[r]
-    if not res then
-        return false, err.new("selecting invalid result: %s", r)
-    end
-    res.selected = true
-    res.force_rebuild = force_rebuild
-    res.keep_chroot = keep_chroot
-    if build_mode then
-        res.build_mode = build_mode
-    end
-    res.playground = playground
-
-    return true
-end
-
-
 --- select results based upon a list of results usually given on the
 -- command line. Parameters are assigned to all selected results.
 -- @param info the info structure
@@ -2290,17 +2259,28 @@ end
 -- @return bool
 -- @return an error object on failure
 function e2tool.select_results(info, results, force_rebuild, keep_chroot, build_mode, playground)
-    local rc, re
+    local rc, re, res
 
     for _,r in ipairs(results) do
-        rc, re = select_result(info, r, force_rebuild, keep_chroot, build_mode,
-            playground)
+        rc, re = e2tool.verify_src_res_name_valid_chars(r)
         if not rc then
-            return false, re
+            return false, err.new("'%s' is not a valid result name", r)
         end
+
+        res = info.results[r]
+        if not res then
+            return false, err.new("selecting invalid result: %s", r)
+        end
+        res.selected = true
+        res.force_rebuild = force_rebuild
+        res.keep_chroot = keep_chroot
+        if build_mode then
+            res.build_mode = build_mode
+        end
+        res.playground = playground
     end
 
-    return true, nil
+    return true
 end
 
 --- print selection status for a list of results