hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bug hunting

Browse source
This commit is contained in:
Gregory Becker 2016-01-05 11:12:14 -08:00
parent 751208cedf
commit d2c2c46541
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/spack/spack/compilers/__init__.py
View file

@ -216,9 +216,9 @@ def compiler_for_spec(compiler_spec, target):
assert(compiler_spec.concrete) assert(compiler_spec.concrete)
compilers = compilers_for_spec(compiler_spec) compilers = compilers_for_spec(compiler_spec)
if target.compiler_strategy == "PATH": if target.compiler_strategy == "PATH":
filter(lambda c: c.modules is None, compilers) compilers = [c for c in compilers if c.modules is None]
elif target.compiler_strategy == "MODULES": elif target.compiler_strategy == "MODULES":
filter(lambda c: c.modules is not None, compilers) compilers = [c for c in compilers if c.modules is not None]
assert(len(compilers) == 1) assert(len(compilers) == 1)
return compilers[0] return compilers[0]

2
lib/spack/spack/config.py
View file

@ -277,7 +277,7 @@ def is_spec_nobuild(spec):
def spec_externals(spec): def spec_externals(spec):
"""Return a list of spec, directory pairs for each external location for spec""" """Return a list of spec, directory, module triples for each external location for spec"""
allpkgs = get_packages_config() allpkgs = get_packages_config()
name = spec.name name = spec.name
spec_locations = [] spec_locations = []

5
lib/spack/spack/spec.py
View file

@ -771,8 +771,9 @@ def _replace_with(self, concrete):
"""Replace this virtual spec with a concrete spec.""" """Replace this virtual spec with a concrete spec."""
assert(self.virtual) assert(self.virtual)
for name, dependent in self.dependents.items(): for name, dependent in self.dependents.items():
del dependent.dependencies[self.name] if not dependent.external:
dependent._add_dependency(concrete) del dependent.dependencies[self.name]
dependent._add_dependency(concrete)
def _expand_virtual_packages(self): def _expand_virtual_packages(self):