From eeacb3cb6ff5510cb5af8ea2c622783562ced91c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 9 May 2014 19:59:49 +0200 Subject: configmanager: Delay importing LuaFileSystem until needed by an Include line --- core/configmanager.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/configmanager.lua b/core/configmanager.lua index d73bafa4..d175b54b 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -14,7 +14,7 @@ local format, math_max = string.format, math.max; local fire_event = prosody and prosody.events.fire_event or function () end; local envload = require"util.envload".envload; -local lfs = require "lfs"; +local deps = require"util.dependencies"; local path_sep = package.config:sub(1,1); module "configmanager" @@ -214,6 +214,10 @@ do function env.Include(file) if file:match("[*?]") then + local lfs = deps.softreq "lfs"; + if not lfs then + error(format("Error expanding wildcard pattern in Include %q - LuaFileSystem not available", file)); + end local path_pos, glob = file:match("()([^"..path_sep.."]+)$"); local path = file:sub(1, math_max(path_pos-2,0)); local config_path = config_file:gsub("[^"..path_sep.."]+$", ""); -- cgit v1.2.3