Commit 271dee89 authored by Jason R. Coombs's avatar Jason R. Coombs

Perform marker calculation in one step

parent cdf2cc4a
......@@ -2697,11 +2697,11 @@ class Distribution(object):
new_extra = extra
reqs = dm.pop(extra)
new_extra, _, marker = extra.partition(':')
if marker:
if invalid_marker(marker):
# XXX warn
reqs = []
elif not evaluate_marker(marker):
fails_marker = marker and (
invalid_marker(marker)
or not evaluate_marker(marker)
)
if fails_marker:
reqs = []
new_extra = safe_extra(new_extra) or None
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment