aboutsummaryrefslogtreecommitdiff
path: root/src/luarocks/deps.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/luarocks/deps.lua')
-rw-r--r--src/luarocks/deps.lua24
1 files changed, 5 insertions, 19 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 9ee21772..cb85764e 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -170,12 +170,13 @@ function deps.fulfill_dependency(dep, deps_mode, name, version, rocks_provided,
170 return nil, "Could not satisfy dependency "..tostring(dep)..": "..search_err 170 return nil, "Could not satisfy dependency "..tostring(dep)..": "..search_err
171 end 171 end
172 util.printout("Installing "..url) 172 util.printout("Installing "..url)
173 local install_flags = { 173 local install_args = {
174 rock = url,
174 deps_mode = deps_mode, 175 deps_mode = deps_mode,
175 namespace = dep.namespace, 176 namespace = dep.namespace,
176 verify = verify, 177 verify = verify,
177 } 178 }
178 local ok, install_err, errcode = install.command(install_flags, url) 179 local ok, install_err, errcode = install.command(install_args)
179 if not ok then 180 if not ok then
180 return nil, "Failed installing dependency: "..url.." - "..install_err, errcode 181 return nil, "Failed installing dependency: "..url.." - "..install_err, errcode
181 end 182 end
@@ -569,23 +570,8 @@ function deps.check_lua_libdir(vars)
569 return nil, "Failed finding Lua library. You may need to configure LUA_LIBDIR.", "dependency" 570 return nil, "Failed finding Lua library. You may need to configure LUA_LIBDIR.", "dependency"
570end 571end
571 572
572local valid_deps_modes = { 573function deps.get_deps_mode(args)
573 one = true, 574 return args.deps_mode or cfg.deps_mode
574 order = true,
575 all = true,
576 none = true,
577}
578
579function deps.check_deps_mode_flag(flag)
580 return valid_deps_modes[flag]
581end
582
583function deps.get_deps_mode(flags)
584 if flags["deps-mode"] then
585 return flags["deps-mode"]
586 else
587 return cfg.deps_mode
588 end
589end 575end
590 576
591return deps 577return deps