summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbecker33 <becker33@llnl.gov>2017-10-09 10:01:55 -0700
committerGitHub <noreply@github.com>2017-10-09 10:01:55 -0700
commit5d13f236b48e380e05d84b1fa418fe3b486adcb8 (patch)
treeafc951f523c0dad1ccf31416135def621bdf46da
parent57643ae84e95d3053d6bb8022b9de0420d151467 (diff)
downloadspack-5d13f236b48e380e05d84b1fa418fe3b486adcb8.tar.gz
spack-5d13f236b48e380e05d84b1fa418fe3b486adcb8.tar.bz2
spack-5d13f236b48e380e05d84b1fa418fe3b486adcb8.tar.xz
spack-5d13f236b48e380e05d84b1fa418fe3b486adcb8.zip
Fix setup for changes to dirty flag (#5592)
* Pass dirty arg through setup to setup_package
-rw-r--r--lib/spack/spack/cmd/setup.py7
-rw-r--r--lib/spack/spack/stage.py3
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/spack/spack/cmd/setup.py b/lib/spack/spack/cmd/setup.py
index e4ca38ba94..bb29fc8afe 100644
--- a/lib/spack/spack/cmd/setup.py
+++ b/lib/spack/spack/cmd/setup.py
@@ -65,9 +65,9 @@ def spack_transitive_include_path():
)
-def write_spconfig(package):
+def write_spconfig(package, dirty):
# Set-up the environment
- spack.build_environment.setup_package(package)
+ spack.build_environment.setup_package(package, dirty)
cmd = [str(which('cmake'))] + package.std_cmake_args + package.cmake_args()
@@ -173,7 +173,8 @@ def setup(self, args):
tty.msg(
'Generating spconfig.py [{0}]'.format(package.spec.cshort_spec)
)
- write_spconfig(package)
+ dirty = args.dirty
+ write_spconfig(package, dirty)
# Install this package to register it in the DB and permit
# module file regeneration
inst_args = copy.deepcopy(args)
diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py
index c8309124bc..d0072b25e2 100644
--- a/lib/spack/spack/stage.py
+++ b/lib/spack/spack/stage.py
@@ -662,6 +662,9 @@ class DIYStage(object):
def restage(self):
tty.die("Cannot restage DIY stage.")
+ def create(self):
+ self.created = True
+
def destroy(self):
# No need to destroy DIY stage.
pass