Merge branch 'master' into luarocks-3

2 files changed, 2 insertions, 2 deletions

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 14130657..a0170f06 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -410,7 +410,7 @@ local function do_build(name, version, deps_mode, build_only_deps)
       return build.build_rock(name, true, deps_mode, build_only_deps)
    elseif not name:match(dir.separator) then
       local search = require("luarocks.search")
-      return search.act_on_src_or_rockspec(build.run, name:lower(), version, deps.deps_mode_to_flag(deps_mode), build_only_deps and "--only-deps")
+      return search.act_on_src_or_rockspec(do_build, name:lower(), version, nil, deps_mode, build_only_deps)
    end
    return nil, "Don't know what to do with "..name
 end
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index b8a36850..6cf5bf9d 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -492,7 +492,7 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
             return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..search_err
          end
          util.printout("Installing "..url)
-         local ok, install_err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode))
+         local ok, install_err, errcode = install.command({deps_mode = deps_mode}, url)
          if not ok then
             return nil, "Failed installing dependency: "..url.." - "..install_err, errcode
          end