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

Merge pull request #732 from citibeth/efischer/160403-ConditionalExtendsBugfix

Browse source 
[Needs Review] Fix conditional extends (BUG #683)
This commit is contained in:
Todd Gamblin 2016-04-04 10:21:26 -07:00
commit c7b11360e9
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/spack/spack/modules.py
View file

@ -163,9 +163,14 @@ def write(self):
# package-specific modifications # package-specific modifications
spack_env = EnvironmentModifications() spack_env = EnvironmentModifications()
for item in self.pkg.extendees: for item in self.pkg.extendees:
package = self.spec[item].package try:
package.setup_dependent_package(self.pkg.module, self.spec) package = self.spec[item].package
package.setup_dependent_environment(spack_env, env, self.spec) 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 # Package-specific environment modifications
self.spec.package.setup_environment(spack_env, env) self.spec.package.setup_environment(spack_env, env)