dlist: use result module, standard naming, drop info

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

diff --git a/local/e2-build.lua b/local/e2-build.lua
index dd86b77f8449a22e946dd942865ab5a0ababd51f..d7ccaf6648a920c5f83e3e4895f46149409cd82e 100644 (file)
--- a/local/e2-build.lua
+++ b/local/e2-build.lua
@@ -175,13 +175,13 @@ local function e2_build(arg)
     local sel_res = {}
     if #results > 0 then
         local re
-        sel_res, re = e2tool.dlist_recursive(info, results)
+        sel_res, re = e2tool.dlist_recursive(results)
         if not sel_res then
             error(re)
         end
     else
         local re
-        sel_res, re = e2tool.dsort(info)
+        sel_res, re = e2tool.dsort()
         if not sel_res then
             error(re)
         end

diff --git a/local/e2-dlist.lua b/local/e2-dlist.lua
index 8a165c08e09cb228467386f1e0684326e15fa301..20789ac53938d5254fcb4c93c879fd910557aa14 100644 (file)
--- a/local/e2-dlist.lua
+++ b/local/e2-dlist.lua
@@ -30,9 +30,10 @@
 
 local console = require("console")
 local e2lib = require("e2lib")
-local e2tool = require("e2tool")
 local e2option = require("e2option")
+local e2tool = require("e2tool")
 local err = require("err")
+local result = require("result")
 
 local function e2_dlist(arg)
     local rc, re = e2lib.init()
@@ -56,21 +57,21 @@ local function e2_dlist(arg)
             "no result given - enter `e2-dlist --help' for usage information"))
     elseif #arguments ~= 1 then e2option.usage(1) end
 
-    local result = arguments[1]
+    local resultname = arguments[1]
     info, re = e2tool.collect_project_info(info)
     if not info then
         error(re)
     end
 
-    if not info.results[ result ] then
-       error(err.new("no such result: %s", result))
+    if not result.results[resultname] then
+       error(err.new("no such result: %s", resultname))
     end
 
     local dep, re
     if opts.recursive then
-        dep, re = e2tool.dlist_recursive(info, result)
+        dep, re = e2tool.dlist_recursive(resultname)
     else
-        dep, re = e2tool.dlist(info, result)
+        dep, re = e2tool.dlist(resultname)
     end
     if not dep then
         error(re)

diff --git a/local/e2-dsort.lua b/local/e2-dsort.lua
index 5cb44bc893ff10bddde32b85a4abf5b189c70999..20622d5f660d6f7b947e60a7967c2ad8b72a326a 100644 (file)
--- a/local/e2-dsort.lua
+++ b/local/e2-dsort.lua
@@ -54,7 +54,7 @@ local function e2_dsort(arg)
         error(re)
     end
 
-    local d = e2tool.dsort(info)
+    local d = e2tool.dsort()
     if d then
         for _,dep in ipairs(d) do
             console.infonl(dep)