diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-02-13 16:12:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 16:12:49 +0000 |
| commit | c6e75c9f2da08c459652603023ba4319c81510f1 (patch) | |
| tree | 20cdd093ae0f12d0e02074941b436e7e6523b571 | |
| parent | Merge remote-tracking branch 'origin/release-v0.99.1' into develop (diff) | |
| parent | Fix error message for optional dependencies (diff) | |
| download | synapse-c6e75c9f2da08c459652603023ba4319c81510f1.tar.xz | |
Merge pull request #4450 from 14mRh4X0r/fix-dependency-message
Fix error message for optional dependencies
| -rw-r--r-- | changelog.d/4450.bugfix | 2 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelog.d/4450.bugfix b/changelog.d/4450.bugfix new file mode 100644 index 0000000000..b194e94c15 --- /dev/null +++ b/changelog.d/4450.bugfix @@ -0,0 +1,2 @@ +The dependency checker now correctly reports a version mismatch for optional +dependencies, instead of reporting the dependency missing. diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 5d087ee26b..590ee59907 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 |