zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #532 from mplegendre/bugfix/ordering_satisfies

Browse Source 
Fix issue with preferred satisfies not being respected
This commit is contained in:
Todd Gamblin 2016-03-10 21:50:40 -08:00
commit f40c78a064
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/spack/spack/concretize.py
View File

@ -70,20 +70,23 @@ def _valid_virtuals_and_externals(self, spec):
# For each candidate package, if it has externals add those to the candidates # For each candidate package, if it has externals add those to the candidates
# if it's a nobuild, then only add the externals. # if it's a nobuild, then only add the externals.
result = [] candidates = []
all_compilers = spack.compilers.all_compilers() all_compilers = spack.compilers.all_compilers()
for pkg in packages: for pkg in packages:
externals = spec_externals(pkg) externals = spec_externals(pkg)
buildable = not is_spec_nobuild(pkg) buildable = not is_spec_nobuild(pkg)
if buildable: if buildable:
result.append((pkg, None)) candidates.append((pkg, None))
for ext in externals: for ext in externals:
if ext[0].satisfies(spec): if ext[0].satisfies(spec):
result.append(ext) candidates.append(ext)
if not result: if not candidates:
raise NoBuildError(spec) raise NoBuildError(spec)
def cmp_externals(a, b): def cmp_externals(a, b):
if a[0].name != b[0].name:
#We're choosing between different providers. Maintain order from above sort
return candidates.index(a) - candidates.index(b)
result = cmp_specs(a[0], b[0]) result = cmp_specs(a[0], b[0])
if result != 0: if result != 0:
return result return result
@ -91,10 +94,10 @@ def cmp_externals(a, b):
return 1 return 1
if not b[1] and a[1]: if not b[1] and a[1]:
return -1 return -1
return cmp_specs(a[1], b[1]) return cmp(a[1], b[1])
result = sorted(result, cmp=cmp_externals) candidates = sorted(candidates, cmp=cmp_externals)
return result return candidates
def concretize_virtual_and_external(self, spec): def concretize_virtual_and_external(self, spec):