summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-13 18:15:14 +0000
committerErik Johnston <erik@matrix.org>2014-12-13 18:15:14 +0000
commit88484f684f68f43b1c13ae12bcf259f14d314dc8 (patch)
tree48bb4095ebb9664d5d35b304f63b78da06c3c790 /synapse/config/_base.py
parentMerge branch 'release-v0.5.4' of github.com:matrix-org/synapse (diff)
parentBump version and change log (diff)
downloadsynapse-88484f684f68f43b1c13ae12bcf259f14d314dc8.tar.xz
Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse v0.5.4a
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 6870af10e8..846570811f 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)