summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-04-05 18:44:40 +0200
committeralalazo <massimiliano.culpo@googlemail.com>2016-04-05 18:44:40 +0200
commit670cb423f91b17b9757b387a9579be4f248d208b (patch)
tree5b58eb410de20bfab1da6ba32ea3373cce35407c /lib
parent5da37c573f13f4c16021f1314a87e4f0c995ba0f (diff)
downloadspack-670cb423f91b17b9757b387a9579be4f248d208b.tar.gz
spack-670cb423f91b17b9757b387a9579be4f248d208b.tar.bz2
spack-670cb423f91b17b9757b387a9579be4f248d208b.tar.xz
spack-670cb423f91b17b9757b387a9579be4f248d208b.zip
modules : iterating on all the dependencies doesn't reuire try/except KeyError
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/modules.py19
1 files changed, 7 insertions, 12 deletions
diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py
index 9a021a7c49..115d4d9a37 100644
--- a/lib/spack/spack/modules.py
+++ b/lib/spack/spack/modules.py
@@ -182,18 +182,13 @@ class EnvModule(object):
# TODO : the code down below is quite similar to build_environment.setup_package and needs to be
# TODO : factored out to a single place
for item in dependencies('All'):
- try:
- package = self.spec[item.name].package
- modules = parent_class_modules(package.__class__)
- for mod in modules:
- set_module_variables_for_package(package, mod)
- set_module_variables_for_package(package, package.module)
- package.setup_dependent_package(self.pkg.module, 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 = self.spec[item.name].package
+ modules = parent_class_modules(package.__class__)
+ for mod in modules:
+ set_module_variables_for_package(package, mod)
+ set_module_variables_for_package(package, package.module)
+ package.setup_dependent_package(self.pkg.module, self.spec)
+ package.setup_dependent_environment(spack_env, env, self.spec)
# Package-specific environment modifications
set_module_variables_for_package(self.pkg, self.pkg.module)