summary refs log tree commit diff
path: root/synapse/app/__init__.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-12-22 01:37:26 +1100
committerGitHub <noreply@github.com>2018-12-22 01:37:26 +1100
commitc26f49a6645a84730811ea7bc5158d826bc43484 (patch)
tree5080d8f5543391c24cb30c4bd7d4511edd00900a /synapse/app/__init__.py
parentMerge branch 'master' into develop (diff)
downloadsynapse-c26f49a6645a84730811ea7bc5158d826bc43484.tar.xz
Make the dependencies more like a standard Python project and hook up the optional dependencies to setuptools (#4298)
Diffstat (limited to 'synapse/app/__init__.py')
-rw-r--r--synapse/app/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py
index c3afcc573b..233bf43fc8 100644
--- a/synapse/app/__init__.py
+++ b/synapse/app/__init__.py
@@ -22,11 +22,11 @@ sys.dont_write_bytecode = True
 
 try:
     python_dependencies.check_requirements()
-except python_dependencies.MissingRequirementError as e:
+except python_dependencies.DependencyException as e:
     message = "\n".join([
-        "Missing Requirement: %s" % (str(e),),
+        "Missing Requirements: %s" % (", ".join(e.dependencies),),
         "To install run:",
-        "    pip install --upgrade --force \"%s\"" % (e.dependency,),
+        "    pip install --upgrade --force %s" % (" ".join(e.dependencies),),
         "",
     ])
     sys.stderr.writelines(message)