From: Kim Alvefur <zash@zash.se>
Date: Fri, 9 May 2014 17:59:49 +0000 (+0200)
Subject: configmanager: Delay importing LuaFileSystem until needed by an Include line
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;ds=sidebyside;h=97dc1e55d6225d0e54c959b288acb9c0ffa9e930;p=prosody.git

configmanager: Delay importing LuaFileSystem until needed by an Include line
---

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.."]+$", "");