# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1347557494 -3600
# Node ID a4a74a0e9b9c84448d2506d43726762be6c2ca8c
# Parent  0dc9e6c128c303ef6aff84d1c937f9da2e06ff47
configmanager: Fix include of relative files via Include directive in config

diff -r 0dc9e6c128c3 -r a4a74a0e9b9c core/configmanager.lua
--- a/core/configmanager.lua	Wed Sep 12 22:03:06 2012 +0500
+++ b/core/configmanager.lua	Thu Sep 13 18:31:34 2012 +0100
@@ -247,11 +247,10 @@
 					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