openstack/requirements
Code Issues Proposed changes

Merge "skip complex comparison for constraints without markers"

Browse Source
This commit is contained in:
Zuul 2018-04-05 04:34:29 +00:00 committed by Gerrit Code Review
commit 3e6841dfc5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_requirements/check.py
View File

@ -204,6 +204,13 @@ def _find_constraint(req, constraints):
for constraint_setting, _ in constraints: for constraint_setting, _ in constraints:
if constraint_setting.markers == req.markers: if constraint_setting.markers == req.markers:
return constraint_setting return constraint_setting
if not constraint_setting.markers:
# There is no point in performing the complex
# comparison for a constraint that has no markers, so
# we skip it here. If we find no closer match then the
# loop at the end of the function will look for a
# constraint without a marker and use that.
continue
# NOTE(dhellmann): This is a very naive attempt to check # NOTE(dhellmann): This is a very naive attempt to check
# marker compatibility that relies on internal # marker compatibility that relies on internal
# implementation details of the packaging library. The # implementation details of the packaging library. The