e2tool: remove buildid() wrapper

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

diff --git a/local/e2-build.lua b/local/e2-build.lua
index eb6ccd540731d5af2dc14ad45ba25582ba7d5671..93654387883d4e0ce98ce4f47d69425a6c767389 100644 (file)
--- a/local/e2-build.lua
+++ b/local/e2-build.lua
@@ -167,22 +167,18 @@ local function e2_build(arg)
     end
 
     -- calculate buildids for selected results
-    for _,r in ipairs(sel_res) do
-        local bid, re = e2tool.buildid(info, r)
+    for _,resultname in ipairs(sel_res) do
+        local bid, re = result.results[resultname]:buildid()
         if not bid then
             error(re)
         end
-    end
 
-    if opts["buildid"] then
-        for _,r in ipairs(sel_res) do
-            local bid, re = e2tool.buildid(info, r)
-            if not bid then
-                error(re)
-            end
-            console.infof("%-20s [%s]\n", r, bid)
+        if opts.buildid then
+            console.infof("%-20s [%s]\n", resultname, bid)
         end
-    else
+    end
+
+    if not opts.buildid then
         -- build
         local rc, re = e2tool.build_results(sel_res)
         if not rc then

diff --git a/local/e2tool.lua b/local/e2tool.lua
index c339bac25051e71a7642a98f910051a4d6b56813..f71125ed0813a3dd7fe15501fe25485419d41b07 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -987,15 +987,6 @@ function e2tool.fileid(info, file)
     return fileid
 end
 
---- Get the buildid for a result, calculating it if required.
--- @param info Info table.
--- @param resultname Result name.
--- @return Build ID or false on error
--- @return Error object on failure
-function e2tool.buildid(info, resultname)
-    return result.results[resultname]:buildid()
-end
-
 --- select (mark) 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