From 3b92924922a21a996adb1312e50dcdf87d1f61f8 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 20 Apr 2018 10:42:16 -0300 Subject: list: show tree in list title when using --tree --- spec/list_spec.lua | 2 +- src/luarocks/cmd/list.lua | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/list_spec.lua b/spec/list_spec.lua index 5a5e363a..e4bb7b45 100644 --- a/spec/list_spec.lua +++ b/spec/list_spec.lua @@ -40,6 +40,6 @@ describe("LuaRocks list tests #blackbox #b_list", function() it("LuaRocks list invalid tree", function() local output = run.luarocks("--tree=/some/invalid/tree list") - assert(output:find("Installed rocks for Lua "..test_env.lua_version, 1, true)) + assert(output:find("Rocks installed for Lua "..test_env.lua_version.." in /some/invalid/tree", 1, true)) end) end) diff --git a/src/luarocks/cmd/list.lua b/src/luarocks/cmd/list.lua index 102a08f0..5e5cfac8 100644 --- a/src/luarocks/cmd/list.lua +++ b/src/luarocks/cmd/list.lua @@ -71,8 +71,10 @@ end function list.command(flags, filter, version) local query = queries.new(filter and filter:lower() or "", version, true) local trees = cfg.rocks_trees + local title = "Rocks installed for Lua "..cfg.lua_version if flags["tree"] then trees = { flags["tree"] } + title = title .. " in " .. flags["tree"] end if flags["outdated"] then @@ -86,7 +88,7 @@ function list.command(flags, filter, version) util.warning(err) end end - util.title("Installed rocks for Lua "..cfg.lua_version..":", flags["porcelain"]) + util.title(title, flags["porcelain"]) search.print_result_tree(results, flags["porcelain"]) return true end -- cgit v1.2.3-55-g6feb