From 670cb423f91b17b9757b387a9579be4f248d208b Mon Sep 17 00:00:00 2001
From: alalazo <massimiliano.culpo@googlemail.com>
Date: Tue, 5 Apr 2016 18:44:40 +0200
Subject: [PATCH] modules : iterating on all the dependencies doesn't reuire
try/except KeyError
---
lib/spack/spack/modules.py | 19 +++++++------------
1 file 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 @@ def dependencies(request='All'):
# 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)
--
GitLab