mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 06:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.dependencies: Pass require error to error formatting function

Browse source 
For future use there.

Silences luacheck warnings about unused 'err'
This commit is contained in:
Kim Alvefur 2019-12-23 21:15:01 +01:00
parent b0361006e1
commit f8e36355ee
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
util/dependencies.lua
View file

@ -13,7 +13,8 @@ if not softreq "luarocks.loader" then -- LuaRocks 2.x
softreq "luarocks.require"; -- LuaRocks <1.x softreq "luarocks.require"; -- LuaRocks <1.x
end end
local function missingdep(name, sources, msg) local function missingdep(name, sources, msg, err) -- luacheck: ignore err
-- TODO print something about the underlying error, useful for debugging
print(""); print("");
print("**************************"); print("**************************");
print("Prosody was unable to find "..tostring(name)); print("Prosody was unable to find "..tostring(name));
@ -44,25 +45,25 @@ local function check_dependencies()
local fatal; local fatal;
local lxp = softreq "lxp" local lxp, err = softreq "lxp"
if not lxp then if not lxp then
missingdep("luaexpat", { missingdep("luaexpat", {
["Debian/Ubuntu"] = "sudo apt-get install lua-expat"; ["Debian/Ubuntu"] = "sudo apt-get install lua-expat";
["luarocks"] = "luarocks install luaexpat"; ["luarocks"] = "luarocks install luaexpat";
["Source"] = "http://matthewwild.co.uk/projects/luaexpat/"; ["Source"] = "http://matthewwild.co.uk/projects/luaexpat/";
}); }, nil, err);
fatal = true; fatal = true;
end end
local socket = softreq "socket" local socket, err = softreq "socket"
if not socket then if not socket then
missingdep("luasocket", { missingdep("luasocket", {
["Debian/Ubuntu"] = "sudo apt-get install lua-socket"; ["Debian/Ubuntu"] = "sudo apt-get install lua-socket";
["luarocks"] = "luarocks install luasocket"; ["luarocks"] = "luarocks install luasocket";
["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"; ["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/";
}); }, nil, err);
fatal = true; fatal = true;
elseif not socket.tcp4 then elseif not socket.tcp4 then
-- COMPAT LuaSocket before being IP-version agnostic -- COMPAT LuaSocket before being IP-version agnostic
@ -76,28 +77,28 @@ local function check_dependencies()
["luarocks"] = "luarocks install luafilesystem"; ["luarocks"] = "luarocks install luafilesystem";
["Debian/Ubuntu"] = "sudo apt-get install lua-filesystem"; ["Debian/Ubuntu"] = "sudo apt-get install lua-filesystem";
["Source"] = "http://www.keplerproject.org/luafilesystem/"; ["Source"] = "http://www.keplerproject.org/luafilesystem/";
}); }, nil, err);
fatal = true; fatal = true;
end end
local ssl = softreq "ssl" local ssl, err = softreq "ssl"
if not ssl then if not ssl then
missingdep("LuaSec", { missingdep("LuaSec", {
["Debian/Ubuntu"] = "sudo apt-get install lua-sec"; ["Debian/Ubuntu"] = "sudo apt-get install lua-sec";
["luarocks"] = "luarocks install luasec"; ["luarocks"] = "luarocks install luasec";
["Source"] = "https://github.com/brunoos/luasec"; ["Source"] = "https://github.com/brunoos/luasec";
}, "SSL/TLS support will not be available"); }, "SSL/TLS support will not be available", err);
end end
local bit = softreq"util.bitcompat"; local bit, err = softreq"util.bitcompat";
if not bit then if not bit then
missingdep("lua-bitops", { missingdep("lua-bitops", {
["Debian/Ubuntu"] = "sudo apt-get install lua-bitop"; ["Debian/Ubuntu"] = "sudo apt-get install lua-bitop";
["luarocks"] = "luarocks install luabitop"; ["luarocks"] = "luarocks install luabitop";
["Source"] = "http://bitop.luajit.org/"; ["Source"] = "http://bitop.luajit.org/";
}, "WebSocket support will not be available"); }, "WebSocket support will not be available", err);
end end
local encodings, err = softreq "util.encodings" local encodings, err = softreq "util.encodings"