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 --- util/pluginloader.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'util/pluginloader.lua') diff --git a/util/pluginloader.lua b/util/pluginloader.lua index 0d7eafa7..004855f0 100644 --- a/util/pluginloader.lua +++ b/util/pluginloader.lua @@ -55,8 +55,23 @@ local function load_code(plugin, resource, env) return f, path; end +local function load_code_ext(plugin, resource, extension, env) + local content, err = load_resource(plugin, resource.."."..extension); + if not content then + content, err = load_resource(resource, resource.."."..extension); + if not content then + return content, err; + end + end + local path = err; + local f, err = envload(content, "@"..path, env); + if not f then return f, err; end + return f, path; +end + return { load_file = load_file; load_resource = load_resource; load_code = load_code; + load_code_ext = load_code_ext; }; -- cgit v1.2.3