Merge branch 'develop' into typing_notifications

This commit is contained in:
Paul "LeoNerd" Evans 2014-12-15 11:19:30 +00:00
commit 0aa8c08478
4 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
Changes in synapse 0.5.4a (2014-12-13)
======================================
* Fix bug while generating the error message when a file path specified in
the config doesn't exist.
Changes in synapse 0.5.4 (2014-12-03) Changes in synapse 0.5.4 (2014-12-03)
===================================== =====================================

View File

@ -1 +1 @@
0.5.4 0.5.4a

View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a synapse home server. """ This is a reference implementation of a synapse home server.
""" """
__version__ = "0.5.4" __version__ = "0.5.4a"

View File

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