From 6beb0ef346cc7fd097a4736a7b27755a84165287 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Tue, 10 May 2016 15:48:33 +0300 Subject: Shorten logging for `luarocks install` Instead of mentioning URL twice in Installing URL... Using URL... switching to 'build' mode simply print Installing URL and don't print URL at all when it's the argument to `luarocks install` (it's a bit redundant), only when it's a result of a search. --- src/luarocks/deps.lua | 1 + src/luarocks/install.lua | 3 +-- 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) if not url then return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..err end + util.printout("Installing "..url) local ok, err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode)) if not ok then 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(...) if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end if name:match("%.rockspec$") or name:match("%.src%.rock$") then - util.printout("Using "..name.."... switching to 'build' mode") local build = require("luarocks.build") return build.run(name, util.forward_flags(flags, "local", "keep", "deps-mode", "only-deps")) elseif name:match("%.rock$") then @@ -190,7 +189,7 @@ function install.run(...) if not url then return nil, err end - util.printout("Installing "..url.."...") + util.printout("Installing "..url) return install.run(url, util.forward_flags(flags)) end end -- cgit v1.2.3-55-g6feb