diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-04 10:21:26 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-04 10:21:26 -0700 |
| commit | c7b11360e9e8baa1682fe5ab4fdb46d89ff80931 (patch) | |
| tree | 2bc11bfdf551d220e4b004b903582eb69e049336 /lib | |
| parent | 266f64d848387b7d36b89f138c8c068ae3b03b70 (diff) | |
| parent | 2f4d8a634d19debbe069f3c44b4d2d6822f693cb (diff) | |
| download | spack-c7b11360e9e8baa1682fe5ab4fdb46d89ff80931.tar.gz spack-c7b11360e9e8baa1682fe5ab4fdb46d89ff80931.tar.bz2 spack-c7b11360e9e8baa1682fe5ab4fdb46d89ff80931.tar.xz spack-c7b11360e9e8baa1682fe5ab4fdb46d89ff80931.zip | |
Merge pull request #732 from citibeth/efischer/160403-ConditionalExtendsBugfix
[Needs Review] Fix conditional extends (BUG #683)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/modules.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py index f6a11c92e3..d797af287d 100644 --- a/lib/spack/spack/modules.py +++ b/lib/spack/spack/modules.py @@ -163,9 +163,14 @@ class EnvModule(object): # package-specific modifications spack_env = EnvironmentModifications() for item in self.pkg.extendees: - package = self.spec[item].package - package.setup_dependent_package(self.pkg.module, self.spec) - package.setup_dependent_environment(spack_env, env, self.spec) + try: + package = self.spec[item].package + package.setup_dependent_package(self.pkg.module, self.spec) + package.setup_dependent_environment(spack_env, env, self.spec) + except: + # The extends was conditional, so it doesn't count here + # eg: extends('python', when='+python') + pass # Package-specific environment modifications self.spec.package.setup_environment(spack_env, env) |