modules : iterating on all the dependencies doesn't reuire try/except KeyError
This commit is contained in:
parent
5da37c573f
commit
670cb423f9
@ -182,7 +182,6 @@ def dependencies(request='All'):
|
|||||||
# TODO : the code down below is quite similar to build_environment.setup_package and needs to be
|
# TODO : the code down below is quite similar to build_environment.setup_package and needs to be
|
||||||
# TODO : factored out to a single place
|
# TODO : factored out to a single place
|
||||||
for item in dependencies('All'):
|
for item in dependencies('All'):
|
||||||
try:
|
|
||||||
package = self.spec[item.name].package
|
package = self.spec[item.name].package
|
||||||
modules = parent_class_modules(package.__class__)
|
modules = parent_class_modules(package.__class__)
|
||||||
for mod in modules:
|
for mod in modules:
|
||||||
@ -190,10 +189,6 @@ def dependencies(request='All'):
|
|||||||
set_module_variables_for_package(package, package.module)
|
set_module_variables_for_package(package, package.module)
|
||||||
package.setup_dependent_package(self.pkg.module, self.spec)
|
package.setup_dependent_package(self.pkg.module, self.spec)
|
||||||
package.setup_dependent_environment(spack_env, env, self.spec)
|
package.setup_dependent_environment(spack_env, env, self.spec)
|
||||||
except KeyError as e:
|
|
||||||
# The extends was conditional, so it doesn't count here
|
|
||||||
# eg: extends('python', when='+python')
|
|
||||||
tty.debug(str(e))
|
|
||||||
|
|
||||||
# Package-specific environment modifications
|
# Package-specific environment modifications
|
||||||
set_module_variables_for_package(self.pkg, self.pkg.module)
|
set_module_variables_for_package(self.pkg, self.pkg.module)
|
||||||
|
Loading…
Reference in New Issue
Block a user