From 407c299828c028d00d48f85f9bf3ba1105b94943 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 24 Dec 2014 17:50:42 +0000 Subject: [PATCH 1/2] improve error msg --- synapse/app/homeserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 140c99f18..c78b6f574 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) From af61c295272d299414d609aa7f7e55c7b07189e8 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Mon, 29 Dec 2014 13:54:05 +0000 Subject: [PATCH 2/2] Return the argument passed to the callback in a deferred callback, otherwise twisted will replace the deferred result with 'None' --- synapse/media/v1/base_resource.py | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse/media/v1/base_resource.py b/synapse/media/v1/base_resource.py index 2f5440ab6..499be8cca 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