forked from MirrorHub/synapse
Merge pull request #4450 from 14mRh4X0r/fix-dependency-message
Fix error message for optional dependencies
This commit is contained in:
commit
c6e75c9f2d
2 changed files with 7 additions and 2 deletions
2
changelog.d/4450.bugfix
Normal file
2
changelog.d/4450.bugfix
Normal file
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue