diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-15 14:45:59 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-15 14:45:59 +0000 |
| commit | 57e0e619f3ddc68673a0d7b345203b1a52ff1fa1 (patch) | |
| tree | d7c45715bc9313f7602243b1cd614d95d1a24858 /synapse/config/_base.py | |
| parent | Add beginnings of upgrade script (diff) | |
| parent | Still send typing notifications to myself if I'm the only one in the room (it... (diff) | |
| download | synapse-57e0e619f3ddc68673a0d7b345203b1a52ff1fa1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts: tests/handlers/test_room.py
Diffstat (limited to 'synapse/config/_base.py')
| -rw-r--r-- | synapse/config/_base.py | 4 |
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) |