From 6380ead2ee9f88be86941da4c1dcac3d2aa29eea Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Sat, 13 Dec 2014 18:03:01 +0000
Subject: [PATCH 1/2] Fix bug while generating the error message when a file
 path specified in the config doesn't exist

---
 synapse/config/_base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 6870af10e..846570811 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)
 

From eea58b80766d8ba6afb6e7805ec13afcfab9dea0 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Sat, 13 Dec 2014 18:04:37 +0000
Subject: [PATCH 2/2] Bump version and change log

---
 CHANGES.rst         | 6 ++++++
 VERSION             | 2 +-
 synapse/__init__.py | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2c57a57a0..0d36e8eef 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -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)
 =====================================
 
diff --git a/VERSION b/VERSION
index 7d8568351..64c6e2f46 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.4
+0.5.4a
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 723e15d50..7e49e1fd0 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.5.4"
+__version__ = "0.5.4a"