summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-07-01 13:56:16 +0100
committerGitHub <noreply@github.com>2020-07-01 13:56:16 +0100
commit244dbb04f7a4c697a46d1f6a6be740f72e61814c (patch)
tree92e2e52108ed5af0235770803be2c19276583222
parentPin link in CHANGES.md (diff)
downloadsynapse-244dbb04f7a4c697a46d1f6a6be740f72e61814c.tar.xz
Fix incorrect error message when database CTYPE was set incorrectly. (#7760)
-rw-r--r--changelog.d/7760.bugfix1
-rw-r--r--synapse/storage/engines/postgres.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/7760.bugfix b/changelog.d/7760.bugfix
new file mode 100644
index 0000000000..f6081f3d30
--- /dev/null
+++ b/changelog.d/7760.bugfix
@@ -0,0 +1 @@
+Fix incorrect error message when database CTYPE was set incorrectly.
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py
index 6c7d08a6f2..a31588080d 100644
--- a/synapse/storage/engines/postgres.py
+++ b/synapse/storage/engines/postgres.py
@@ -92,7 +92,7 @@ class PostgresEngine(BaseDatabaseEngine):
             errors.append("    - 'COLLATE' is set to %r. Should be 'C'" % (collation,))
 
         if ctype != "C":
-            errors.append("    - 'CTYPE' is set to %r. Should be 'C'" % (collation,))
+            errors.append("    - 'CTYPE' is set to %r. Should be 'C'" % (ctype,))
 
         if errors:
             raise IncorrectDatabaseSetup(