OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If a non-globbed included file from config cannot be found then warn the user

0.7.1-dev
Justin Clark-Casey (justincc) 2011-01-28 22:46:29 +00:00
parent 810f4b9835
commit 1fcb919798
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -180,6 +180,7 @@ namespace OpenSim
{ {
if (ReadConfig(sources[i])) if (ReadConfig(sources[i]))
iniFileExists = true; iniFileExists = true;
AddIncludes(sources); AddIncludes(sources);
} }
@ -235,10 +236,19 @@ namespace OpenSim
string path = Path.Combine(basepath, chunkWithoutWildcards); string path = Path.Combine(basepath, chunkWithoutWildcards);
path = Path.GetFullPath(path) + chunkWithWildcards; path = Path.GetFullPath(path) + chunkWithWildcards;
string[] paths = Util.Glob(path); string[] paths = Util.Glob(path);
foreach (string p in paths)
// If the include path contains no wildcards, then warn the user that it wasn't found.
if (wildcardIndex == -1 && paths.Length == 0)
{ {
if (!sources.Contains(p)) m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
sources.Add(p); }
else
{
foreach (string p in paths)
{
if (!sources.Contains(p))
sources.Add(p);
}
} }
} }
} }