Software / code / prosody
Changeset
6167:5af7fe1014db
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 May 2014 23:28:09 +0200 |
| parents | 6165:6a184b16b717 (current diff) 6166:46cb87d531a7 (diff) |
| children | 6168:3942630b4e35 6169:cb15eac75b50 |
| files | core/configmanager.lua |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/configmanager.lua Fri May 09 19:35:29 2014 +0200 +++ b/core/configmanager.lua Fri May 09 23:28:09 2014 +0200 @@ -14,7 +14,7 @@ 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 resolve_relative_path = require"util.paths".resolve_relative_path; local glob_to_pattern = require"util.paths".glob_to_pattern; local path_sep = package.config:sub(1,1); @@ -183,6 +183,10 @@ 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.."]+$", "");
