aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/cmd.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 7e0abe59..7710dc68 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -109,16 +109,16 @@ do
109 table.insert(cfg.rocks_trees, 1, { name = "project", root = tree } ) 109 table.insert(cfg.rocks_trees, 1, { name = "project", root = tree } )
110 manif.load_rocks_tree_manifests() 110 manif.load_rocks_tree_manifests()
111 path.use_tree(tree) 111 path.use_tree(tree)
112 elseif cfg.local_by_default then
113 local ok, err = set_named_tree(args, "user")
114 if not ok then
115 return nil, err
116 end
117 elseif project_dir then 112 elseif project_dir then
118 local project_tree = project_dir .. "/lua_modules" 113 local project_tree = project_dir .. "/lua_modules"
119 table.insert(cfg.rocks_trees, 1, { name = "project", root = project_tree } ) 114 table.insert(cfg.rocks_trees, 1, { name = "project", root = project_tree } )
120 manif.load_rocks_tree_manifests() 115 manif.load_rocks_tree_manifests()
121 path.use_tree(project_tree) 116 path.use_tree(project_tree)
117 elseif cfg.local_by_default then
118 local ok, err = set_named_tree(args, "user")
119 if not ok then
120 return nil, err
121 end
122 else 122 else
123 local trees = cfg.rocks_trees 123 local trees = cfg.rocks_trees
124 path.use_tree(trees[#trees]) 124 path.use_tree(trees[#trees])