]> git.e2factory.org Git - e2factory.git/commitdiff
e2tool: remove unused print_selection and selected marker
authorTobias Ulmer <tu@emlix.com>
Fri, 3 Nov 2017 18:13:26 +0000 (19:13 +0100)
committerTobias Ulmer <tu@emlix.com>
Mon, 10 Dec 2018 17:00:11 +0000 (18:00 +0100)
Signed-off-by: Tobias Ulmer <tu@emlix.com>
local/e2-build.lua
local/e2build.lua
local/e2tool.lua

index 348f319a9cd5f012a74d297c6b0270ca422b2508..2be288f46859b9990693024bd8797c3439122231 100644 (file)
@@ -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()
index 1e60dc4817302656bc0cb33cba2103605bb4f09f..397bd4bfea6ac233da1c2a2c3b6b1a566af779e2 100644 (file)
@@ -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
index 527597ec284d84c67c112bfb4f41b81b90a5d494..a3dab0f5a5b52e81df0f1487a21213f736ab569f 100644 (file)
@@ -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: