Merge branch 'daniel/useragent' into daniel/3pidinvites

2015-10-06 09:55:21 -05:00 · 2015-10-06 09:55:21 -05:00 · ca6496c27c
parent c05b5ef7b0 492beb62a8
commit ca6496c27c
1 changed files with 1 additions and 1 deletions
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@ -69,7 +69,7 @@ class SimpleHttpClient(object):
        )
        self.user_agent = hs.version_string
        if hs.config.user_agent_suffix:
-            self.user_agent += " - " + hs.config.user_agent_suffix
+            self.user_agent = "%s %s" % (self.user_agent, hs.config.user_agent_suffix,)

    def request(self, method, uri, *args, **kwargs):
        # A small wrapper around self.agent.request() so we can easily attach