From 485edbb641f96391404013aca46c5131f3154ae9 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Fri, 25 Nov 2016 19:30:31 +0100 Subject: [PATCH] e2tool: remove buildid() wrapper Signed-off-by: Tobias Ulmer --- local/e2-build.lua | 18 +++++++----------- local/e2tool.lua | 9 --------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/local/e2-build.lua b/local/e2-build.lua index eb6ccd5..9365438 100644 --- 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 c339bac..f71125e 100644 --- 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 -- 2.39.5