diff options
Diffstat (limited to 'src/luarocks/path.lua')
-rw-r--r-- | src/luarocks/path.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua index 42d3b8f1..64a203ef 100644 --- a/src/luarocks/path.lua +++ b/src/luarocks/path.lua | |||
@@ -306,13 +306,13 @@ function use_tree(tree) | |||
306 | cfg.deploy_lib_dir = deploy_lib_dir(tree) | 306 | cfg.deploy_lib_dir = deploy_lib_dir(tree) |
307 | end | 307 | end |
308 | 308 | ||
309 | function map_trees(use_trees, fn, ...) | 309 | function map_trees(deps_mode, fn, ...) |
310 | local result = {} | 310 | local result = {} |
311 | if use_trees == "one" then | 311 | if deps_mode == "one" then |
312 | table.insert(result, (fn(cfg.root_dir, ...)) or 0) | 312 | table.insert(result, (fn(cfg.root_dir, ...)) or 0) |
313 | elseif use_trees == "all" or use_trees == "order" then | 313 | elseif deps_mode == "all" or deps_mode == "order" then |
314 | local use = false | 314 | local use = false |
315 | if use_trees == "all" then | 315 | if deps_mode == "all" then |
316 | use = true | 316 | use = true |
317 | end | 317 | end |
318 | for _, tree in ipairs(cfg.rocks_trees) do | 318 | for _, tree in ipairs(cfg.rocks_trees) do |
@@ -374,7 +374,7 @@ end | |||
374 | -- @return boolean This function always succeeds. | 374 | -- @return boolean This function always succeeds. |
375 | function run(...) | 375 | function run(...) |
376 | local flags = util.parse_flags(...) | 376 | local flags = util.parse_flags(...) |
377 | local deps_mode = deps.flags_to_deps_mode(flags) | 377 | local deps_mode = deps.get_deps_mode(flags) |
378 | 378 | ||
379 | util.printout(cfg.export_lua_path:format(util.remove_path_dupes(package.path, ';'))) | 379 | util.printout(cfg.export_lua_path:format(util.remove_path_dupes(package.path, ';'))) |
380 | util.printout(cfg.export_lua_cpath:format(util.remove_path_dupes(package.cpath, ';'))) | 380 | util.printout(cfg.export_lua_cpath:format(util.remove_path_dupes(package.cpath, ';'))) |