From: Tobias Ulmer Date: Fri, 3 Nov 2017 18:13:26 +0000 (+0100) Subject: e2tool: remove unused print_selection and selected marker X-Git-Tag: e2factory-2.3.18rc1~99 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=bbf4e03f8f69a1c56ec3dcc655ed35dcbb136f32;p=e2factory.git e2tool: remove unused print_selection and selected marker Signed-off-by: Tobias Ulmer --- diff --git a/local/e2-build.lua b/local/e2-build.lua index 348f319..2be288f 100644 --- a/local/e2-build.lua +++ b/local/e2-build.lua @@ -236,7 +236,6 @@ local function e2_build(arg) for _,resultname in ipairs(selected_results) do local res = result.results[resultname] local bp = res:build_process() - bp:build_settings():selected(true) bp:build_settings():force_rebuild(force_rebuild) bp:build_settings():keep_chroot(keep_chroot) bp:build_settings():prep_playground(playground) @@ -247,7 +246,6 @@ local function e2_build(arg) for _,resultname in ipairs(tag_mode_results) do local res = result.results[resultname] local bp = res:build_process() - bp:build_settings():selected(true) bp:build_settings():force_rebuild(force_rebuild) bp:build_settings():keep_chroot(keep_chroot) bp:build_settings():prep_playground(playground) @@ -258,7 +256,6 @@ local function e2_build(arg) for _,resultname in ipairs(branch_mode_results) do local res = result.results[resultname] local bp = res:build_process() - bp:build_settings():selected(true) bp:build_settings():force_rebuild(force_rebuild) bp:build_settings():keep_chroot(keep_chroot) bp:build_settings():prep_playground(playground) @@ -269,18 +266,12 @@ local function e2_build(arg) for _,resultname in ipairs(wc_mode_results) do local res = result.results[resultname] local bp = res:build_process() - bp:build_settings():selected(true) bp:build_settings():force_rebuild(force_rebuild) bp:build_settings():keep_chroot(keep_chroot) bp:build_settings():prep_playground(playground) bp:build_mode(policy.default_build_mode("working-copy")) end - rc, re = e2tool.print_selection(ordered_results) - if not rc then - error(re) - end - -- calculate buildids for selected results for _,resultname in ipairs(ordered_results) do local bid, re = result.results[resultname]:buildid() diff --git a/local/e2build.lua b/local/e2build.lua index 1e60dc4..397bd4b 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -1197,15 +1197,6 @@ function e2build.build_settings_class:initialize() self._prep_playground = false end ---- -function e2build.build_settings_class:selected(value) - if value ~= nil then - assertIsBoolean(value) - self._selected = value - end - return self._selected -end - --- function e2build.build_settings_class:force_rebuild(value) if value ~= nil then diff --git a/local/e2tool.lua b/local/e2tool.lua index 527597e..a3dab0f 100644 --- a/local/e2tool.lua +++ b/local/e2tool.lua @@ -1349,30 +1349,6 @@ function e2tool.build_results(resultv) return true end ---- Print selection status for a list of results --- @param resultvec table: list of result names --- @return bool --- @return an error object on failure -function e2tool.print_selection(resultvec) - for _,resultname in ipairs(resultvec) do - local e = err.new("error printing selected results") - local res = result.results[resultname] - if not res then - return false, e:append("no such result: %s", resultname) - end - - local bp = res:build_process() - local settings = bp:build_settings() - - local s = settings:selected() and "[ selected ]" or "[dependency]" - local f = settings:force_rebuild() and "[force rebuild]" or "" - local p = settings:prep_playground() and "[playground]" or "" - - e2lib.logf(4, "Selected result: %-20s %s %s %s", resultname, s, f, p) - end - return true -end - return strict.lock(e2tool) -- vim:sw=4:sts=4:et: