Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2014-12-13 18:16:12 +00:00
commit 3983c7fb0f
4 changed files with 10 additions and 4 deletions

View file

@ -44,9 +44,9 @@ class Config(object):
)
if not os.path.exists(file_path):
raise ConfigError(
"File % config for %s doesn't exist."
"File %s config for %s doesn't exist."
" Try running again with --generate-config"
% (config_name,)
% (file_path, config_name,)
)
return cls.abspath(file_path)