From 6063b9a08ed5a43d090513ad283acb404aa51522 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 13 Sep 2012 18:31:34 +0100 Subject: configmanager: Fix include of relative files via Include directive in config --- core/configmanager.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/configmanager.lua b/core/configmanager.lua index 8fea3be5..51b9f5fe 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -247,11 +247,10 @@ do end end else + local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file); local f, err = io.open(file); if f then - local data = f:read("*a"); - local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file); - local ret, err = parsers.lua.load(data, file, config); + local ret, err = parsers.lua.load(f:read("*a"), file, config); if not ret then error(err:gsub("%[string.-%]", file), 0); end end if not f then error("Error loading included "..file..": "..err, 0); end -- cgit v1.2.3