Skip to content
Permalink
Browse files

Merge pull request #4450 from 14mRh4X0r/fix-dependency-message

Fix error message for optional dependencies
  • Loading branch information...
richvdh committed Feb 13, 2019
2 parents c1dfd6a + d528406 commit c6e75c9f2da08c459652603023ba4319c81510f1
Showing with 7 additions and 2 deletions.
  1. +2 −0 changelog.d/4450.bugfix
  2. +5 −2 synapse/python_dependencies.py
@@ -0,0 +1,2 @@
The dependency checker now correctly reports a version mismatch for optional
dependencies, instead of reporting the dependency missing.
@@ -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

0 comments on commit c6e75c9

Please sign in to comment.
You can’t perform that action at this time.