From d0c5e1571fcd0d0242815c1076d56ecf917eec13 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 1 Feb 2016 21:26:15 +0000 Subject: modulemanager, util.pluginloader: Move logic for locating some module libraries to pluginloader, to fix problems with non-filesystem errors being masked by the second load_code call --- core/moduleapi.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'core/moduleapi.lua') diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 5817894f..c439ba6f 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -135,10 +135,7 @@ function api:wrap_global(event, handler) end function api:require(lib) - local f, n = pluginloader.load_code(self.name, lib..".lib.lua", self.environment); - if not f then - f, n = pluginloader.load_code(lib, lib..".lib.lua", self.environment); - end + local f, n = pluginloader.load_code_ext(self.name, lib, "lib.lua", self.environment); if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message return f(); end -- cgit v1.2.3