mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-02-21 10:01:54 +00:00
bundled zetuptoolz: choose a binary dist in preference to a source dist, even if the latter is newer, as long as the former satisfies the requirement
patch by David-Sarah, tiny bugfix to patch by Zooko ref: #1233
This commit is contained in:
parent
a1cef915fd
commit
a44330dfee
@ -436,18 +436,18 @@ class PackageIndex(Environment):
|
||||
def find(env, req):
|
||||
# Find a matching distribution; may be called more than once
|
||||
|
||||
for dist in env[req.key]:
|
||||
|
||||
if dist.precedence==DEVELOP_DIST and not develop_ok:
|
||||
if dist not in skipped:
|
||||
self.warn("Skipping development or system egg: %s",dist)
|
||||
skipped[dist] = 1
|
||||
continue
|
||||
|
||||
if dist in req and (dist.precedence<=SOURCE_DIST or not source):
|
||||
return dist
|
||||
|
||||
# first try to find a platform-dependent dist
|
||||
for allow_platform_independent in (False, True):
|
||||
for dist in env[req.key]:
|
||||
if dist.precedence==DEVELOP_DIST and not develop_ok:
|
||||
if dist not in skipped:
|
||||
self.warn("Skipping development or system egg: %s",dist)
|
||||
skipped[dist] = 1
|
||||
continue
|
||||
|
||||
if (dist in req and (allow_platform_independent or dist.platform is not None) and
|
||||
(dist.precedence<=SOURCE_DIST or not source)):
|
||||
return dist
|
||||
|
||||
if force_scan:
|
||||
self.prescan()
|
||||
|
Loading…
x
Reference in New Issue
Block a user