summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-12-15 11:19:30 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-12-15 11:19:30 +0000
commit0aa8c0847876074b7985f7a5de73ff1d36af0e1a (patch)
tree8d1ac270bf3d0c91b2c0644544444493e53021c0 /synapse/config/_base.py
parentSend list of typing user IDs as 'user_ids' list within 'content', so that m.t... (diff)
parentMerge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-0aa8c0847876074b7985f7a5de73ff1d36af0e1a.tar.xz
Merge branch 'develop' into typing_notifications
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r--synapse/config/_base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py

index 1426436dcb..1cdd03e414 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py
@@ -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)