Mercurial > prosody-hg

comparison core/configmanager.lua @ 3780:791aede977da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configmanager: Switch back to returning 'ok' to signal config load success - fixes config errors not being displayed
author Matthew Wild <mwild1@gmail.com>
date Sat, 18 Dec 2010 23:15:58 +0000
parents f617718d2221
children 9222dad9e1e8
comparison
equal deleted inserted replaced
3779:fb1d2e5a2fc9 3780:791aede977da
100 filename = filename, 100 filename = filename,
101 format = format, 101 format = format,
102 config = config 102 config = config
103 }); 103 });
104 end 104 end
105 return not not new_config, "parser", err; 105 return ok, "parser", err;
106 end 106 end
107 return f, "file", err; 107 return f, "file", err;
108 end 108 end
109 109
110 if not format then 110 if not format then