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): ...@@ -2697,11 +2697,11 @@ class Distribution(object):
new_extra = extra new_extra = extra
reqs = dm.pop(extra) reqs = dm.pop(extra)
new_extra, _, marker = extra.partition(':') new_extra, _, marker = extra.partition(':')
if marker: fails_marker = marker and (
if invalid_marker(marker): invalid_marker(marker)
# XXX warn or not evaluate_marker(marker)
reqs = [] )
elif not evaluate_marker(marker): if fails_marker:
reqs = [] reqs = []
new_extra = safe_extra(new_extra) or None 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