summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorWillem Mulder <willemmaster@hotmail.com>2019-01-23 18:41:59 +0100
committerWillem Mulder <willemmaster@hotmail.com>2019-01-23 18:44:57 +0100
commitd528406cb875b78907c7f7dc9872c1d2c22dc46c (patch)
treec0c9c2d0ad5c63403726c813e85d80da6af39564 /synapse/python_dependencies.py
parentMerge pull request #4445 from matrix-org/anoa/user_dir_develop_backport (diff)
downloadsynapse-d528406cb875b78907c7f7dc9872c1d2c22dc46c.tar.xz
Fix error message for optional dependencies
Signed-off-by: Willem Mulder <willemmaster@hotmail.com>
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 756721e304..df3e94dee0 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -143,9 +143,12 @@ def check_requirements(for_feature=None, _get_distribution=get_distribution):
         for dependency in OPTS:
             try:
                 _get_distribution(dependency)
-            except VersionConflict:
+            except VersionConflict as e:
                 deps_needed.append(dependency)
-                errors.append("Needed %s but it was not installed" % (dependency,))
+                errors.append(
+                    "Needed optional %s, got %s==%s"
+                    % (dependency, e.dist.project_name, e.dist.version)
+                )
             except DistributionNotFound:
                 # If it's not found, we don't care
                 pass