summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-07 09:40:42 +0000
committerErik Johnston <erik@matrix.org>2015-01-07 09:40:42 +0000
commit1497e50649f2b3a7a4b7e119fd3cb85a22f87e92 (patch)
tree6e24afc0c9f112674e26662e470a178e60c955c4 /synapse
parentOptimize FrozenEvent creation (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-1497e50649f2b3a7a4b7e119fd3cb85a22f87e92.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse')
-rwxr-xr-xsynapse/app/homeserver.py2
-rw-r--r--synapse/media/v1/base_resource.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index f8484f1a3b..5fec8da7ca 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -234,7 +234,7 @@ def setup():
     except UpgradeDatabaseException:
         sys.stderr.write(
             "\nFailed to upgrade database.\n"
-            "Have you followed any instructions in UPGRADES.rst?\n"
+            "Have you checked for version specific instructions in UPGRADES.rst?\n"
         )
         sys.exit(1)
 
diff --git a/synapse/media/v1/base_resource.py b/synapse/media/v1/base_resource.py
index d2e5c947d1..688e7376ad 100644
--- a/synapse/media/v1/base_resource.py
+++ b/synapse/media/v1/base_resource.py
@@ -139,6 +139,7 @@ class BaseMediaResource(Resource):
             @download.addBoth
             def callback(media_info):
                 del self.downloads[key]
+                return media_info
         return download
 
     @defer.inlineCallbacks