mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 11:42:15 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
5cf45c4319
@ -234,7 +234,7 @@ def setup():
|
|||||||
except UpgradeDatabaseException:
|
except UpgradeDatabaseException:
|
||||||
sys.stderr.write(
|
sys.stderr.write(
|
||||||
"\nFailed to upgrade database.\n"
|
"\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)
|
sys.exit(1)
|
||||||
|
|
||||||
|
@ -139,6 +139,7 @@ class BaseMediaResource(Resource):
|
|||||||
@download.addBoth
|
@download.addBoth
|
||||||
def callback(media_info):
|
def callback(media_info):
|
||||||
del self.downloads[key]
|
del self.downloads[key]
|
||||||
|
return media_info
|
||||||
return download
|
return download
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
|
Loading…
Reference in New Issue
Block a user