From 0c534c71465474b92710a2951bf15370fcc8c663 Mon Sep 17 00:00:00 2001 From: FYP Date: Sun, 21 Oct 2018 20:46:36 +0300 Subject: cmd: fix setting up deployment paths from a tree (Amended with a regression test.) Co-authored-by: Hisham Muhammad --- src/luarocks/cmd.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua index fc98e45f..996900ff 100644 --- a/src/luarocks/cmd.lua +++ b/src/luarocks/cmd.lua @@ -150,10 +150,10 @@ end local process_tree_flags do - local function replace_tree(flags, tree) - tree = dir.normalize(tree) - flags["tree"] = tree - path.use_tree(tree) + local function replace_tree(flags, root, tree) + root = dir.normalize(root) + flags["tree"] = root + path.use_tree(tree or root) end local function find_project_dir() @@ -195,7 +195,7 @@ do if not tree.root then return nil, "Configuration error: tree '"..tree.name.."' has no 'root' field." end - replace_tree(flags, tree.root) + replace_tree(flags, tree.root, tree) named = true break end -- cgit v1.2.3-55-g6feb