# HG changeset patch # User Matthew Wild # Date 1292970354 0 # Node ID 7cb03d67101b2a945d9d50f0a8cba0db2aaf21a0 # Parent 4dfb345e33ecd3f87d7d59cf3a00e86db5784b7f configmanager: Filenames without a path are also relative to the config file path, not the current working directory diff -r 4dfb345e33ec -r 7cb03d67101b core/configmanager.lua --- a/core/configmanager.lua Tue Dec 21 15:26:37 2010 +0000 +++ b/core/configmanager.lua Tue Dec 21 22:25:54 2010 +0000 @@ -221,10 +221,11 @@ if file:match("[*?]") then 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.."]+$", ""); if #path > 0 then - path = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), path); + path = resolve_relative_path(config_path, path); else - path = "."; + path = config_path; end local patt = glob_to_pattern(glob); for f in lfs.dir(path) do