summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-03-15 14:05:30 +0100
committeralalazo <massimiliano.culpo@googlemail.com>2016-03-15 14:05:30 +0100
commit572cb93bf8131d222d2d08bca13fd9de6fded1f4 (patch)
treed4e62a5c495a9dadbe29c37cbac9b9b494001518 /lib
parentc85888eb5763d453af7b7255b6d8c3461082362f (diff)
downloadspack-572cb93bf8131d222d2d08bca13fd9de6fded1f4.tar.gz
spack-572cb93bf8131d222d2d08bca13fd9de6fded1f4.tar.bz2
spack-572cb93bf8131d222d2d08bca13fd9de6fded1f4.tar.xz
spack-572cb93bf8131d222d2d08bca13fd9de6fded1f4.zip
package : renamed `setup_dependent_environment` to `module_modifications`
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/build_environment.py4
-rw-r--r--lib/spack/spack/package.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
index d321a0e495..e86a7c413a 100644
--- a/lib/spack/spack/build_environment.py
+++ b/lib/spack/spack/build_environment.py
@@ -284,8 +284,8 @@ def setup_package(pkg):
# Allow dependencies to set up environment as well.
for dep_spec in pkg.spec.traverse(root=False):
- env.extend(dep_spec.package.environment_modifications(pkg.module, dep_spec, pkg.spec))
- dep_spec.package.setup_dependent_environment(pkg.module, dep_spec, pkg.spec)
+ dep_spec.package.module_modifications(pkg.module, dep_spec, pkg.spec)
+ env.extend(dep_spec.package.environment_modifications(pkg.spec))
apply_environment_modifications(env)
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 224d7f8f4b..c1a5c912be 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -984,10 +984,10 @@ class Package(object):
fromlist=[self.__class__.__name__])
- def environment_modifications(self, module, spec, dependent_spec):
+ def environment_modifications(self, dependent_spec):
return EnvironmentModifications()
- def setup_dependent_environment(self, module, spec, dependent_spec):
+ def module_modifications(self, module, spec, dependent_spec):
"""Called before the install() method of dependents.
Default implementation does nothing, but this can be