From bcd7bb1654ebf0a5190c7ed71f74237a5e486971 Mon Sep 17 00:00:00 2001 From: Rob Hoelz Date: Tue, 11 Sep 2012 22:53:23 +0200 Subject: Return error message for require loader require() expects a loader to return a string when an error occurs. This patch has Luarocks do this as well. --- src/luarocks/loader.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua index a0120c5f..139bcb8b 100644 --- a/src/luarocks/loader.lua +++ b/src/luarocks/loader.lua @@ -116,7 +116,7 @@ local function call_other_loaders(module, name, version, module_name) end end end - return nil, "Failed loading module "..module.." in LuaRocks rock "..name.." "..version + return "Failed loading module "..module.." in LuaRocks rock "..name.." "..version end --- Search for a module in the rocks trees @@ -218,7 +218,7 @@ end function luarocks_loader(module) local name, version, module_name = pick_module(module) if not name then - return nil, "No LuaRocks module found for "..module + return "No LuaRocks module found for "..module else add_context(name, version) return call_other_loaders(module, name, version, module_name) -- cgit v1.2.3-55-g6feb