aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2015-12-01 15:17:23 -0200
committerHisham Muhammad <hisham@gobolinux.org>2015-12-01 15:17:23 -0200
commitadec4bf7f83e5d9214c708e816f8041f0da94541 (patch)
tree0c2f897adc65e41a52d29436e0be8cc7f9a554c9 /src
parent8d8e36451aae7f5832efe9ff64de4307e6e8b6a6 (diff)
downloadluarocks-adec4bf7f83e5d9214c708e816f8041f0da94541.tar.gz
luarocks-adec4bf7f83e5d9214c708e816f8041f0da94541.tar.bz2
luarocks-adec4bf7f83e5d9214c708e816f8041f0da94541.zip
Make sure --local always implies --tree=home.
Alternative fix for problem mentioned in #352.
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/command_line.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index dbf64b9c..e1c9f492 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -31,12 +31,17 @@ end
31local function replace_tree(flags, args, tree) 31local function replace_tree(flags, args, tree)
32 tree = dir.normalize(tree) 32 tree = dir.normalize(tree)
33 flags["tree"] = tree 33 flags["tree"] = tree
34 local added = false
34 for i = 1, #args do 35 for i = 1, #args do
35 if args[i]:match("%-%-tree=") then 36 if args[i]:match("%-%-tree=") then
36 args[i] = "--tree="..tree 37 args[i] = "--tree="..tree
38 added = true
37 break 39 break
38 end 40 end
39 end 41 end
42 if not added then
43 args[#args + 1] = "--tree="..tree
44 end
40 path.use_tree(tree) 45 path.use_tree(tree)
41end 46end
42 47