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

Fix setup for changes to dirty flag (#5592)

Browse source 
* Pass dirty arg through setup to setup_package
This commit is contained in:
becker33 2017-10-09 10:01:55 -07:00 committed by GitHub
parent 57643ae84e
commit 5d13f236b4
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/spack/spack/cmd/setup.py
View file

@ -65,9 +65,9 @@ def spack_transitive_include_path():
) )
def write_spconfig(package): def write_spconfig(package, dirty):
# Set-up the environment # 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() cmd = [str(which('cmake'))] + package.std_cmake_args + package.cmake_args()
@ -173,7 +173,8 @@ def setup(self, args):
tty.msg( tty.msg(
'Generating spconfig.py [{0}]'.format(package.spec.cshort_spec) '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 # Install this package to register it in the DB and permit
# module file regeneration # module file regeneration
inst_args = copy.deepcopy(args) inst_args = copy.deepcopy(args)

3
lib/spack/spack/stage.py
View file

@ -662,6 +662,9 @@ def expand_archive(self):
def restage(self): def restage(self):
tty.die("Cannot restage DIY stage.") tty.die("Cannot restage DIY stage.")
def create(self):
self.created = True
def destroy(self): def destroy(self):
# No need to destroy DIY stage. # No need to destroy DIY stage.
pass pass