aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/luarocks/deps.lua1
-rw-r--r--src/luarocks/install.lua3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 812e6d18..ac294f54 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -488,6 +488,7 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
488 if not url then 488 if not url then
489 return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..err 489 return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..err
490 end 490 end
491 util.printout("Installing "..url)
491 local ok, err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode)) 492 local ok, err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode))
492 if not ok then 493 if not ok then
493 return nil, "Failed installing dependency: "..url.." - "..err, errcode 494 return nil, "Failed installing dependency: "..url.." - "..err, errcode
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index c938aa9f..ae162b86 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -168,7 +168,6 @@ function install.run(...)
168 if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end 168 if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end
169 169
170 if name:match("%.rockspec$") or name:match("%.src%.rock$") then 170 if name:match("%.rockspec$") or name:match("%.src%.rock$") then
171 util.printout("Using "..name.."... switching to 'build' mode")
172 local build = require("luarocks.build") 171 local build = require("luarocks.build")
173 return build.run(name, util.forward_flags(flags, "local", "keep", "deps-mode", "only-deps")) 172 return build.run(name, util.forward_flags(flags, "local", "keep", "deps-mode", "only-deps"))
174 elseif name:match("%.rock$") then 173 elseif name:match("%.rock$") then
@@ -190,7 +189,7 @@ function install.run(...)
190 if not url then 189 if not url then
191 return nil, err 190 return nil, err
192 end 191 end
193 util.printout("Installing "..url.."...") 192 util.printout("Installing "..url)
194 return install.run(url, util.forward_flags(flags)) 193 return install.run(url, util.forward_flags(flags))
195 end 194 end
196end 195end