zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug propagating --dirty flag to sub-installs. (#1625)

Browse Source 
* Fixed bug propagating --dirty flag to sub-installs.

* Fix syntax error

* Allow --dirty flag to be set with SPACK_DIRTY env var.

* Added dirty flag to `spack diy` and `spack setup`, as is currently in `spack install`

* flake8
This commit is contained in:
Elizabeth Fischer 2016-09-21 06:56:56 -04:00 committed by Todd Gamblin
parent 73012ec4c8
commit 899f3a7e37
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/spack/spack/cmd/diy.py
View File

@ -52,6 +52,10 @@ def setup_parser(subparser):
subparser.add_argument( subparser.add_argument(
'spec', nargs=argparse.REMAINDER, 'spec', nargs=argparse.REMAINDER,
help="specs to use for install. Must contain package AND version.") help="specs to use for install. Must contain package AND version.")
subparser.add_argument(
'--dirty', action='store_true', dest='dirty',
help="Install a package *without* cleaning the environment. " +
"Or set SPACK_DIRTY environment variable")
def diy(self, args): def diy(self, args):
@ -100,4 +104,5 @@ def diy(self, args):
keep_prefix=args.keep_prefix, keep_prefix=args.keep_prefix,
ignore_deps=args.ignore_deps, ignore_deps=args.ignore_deps,
verbose=not args.quiet, verbose=not args.quiet,
keep_stage=True) # don't remove source dir for DIY. keep_stage=True, # don't remove source dir for DIY.
dirty=args.dirty or ('SPACK_DIRTY' in os.environ))

6
lib/spack/spack/cmd/install.py
View File

@ -28,6 +28,7 @@
import spack import spack
import spack.cmd import spack.cmd
import os
description = "Build and install packages" description = "Build and install packages"
@ -56,7 +57,8 @@ def setup_parser(subparser):
help="Fake install. Just remove prefix and create a fake file.") help="Fake install. Just remove prefix and create a fake file.")
subparser.add_argument( subparser.add_argument(
'--dirty', action='store_true', dest='dirty', '--dirty', action='store_true', dest='dirty',
help="Install a package *without* cleaning the environment.") help="Install a package *without* cleaning the environment. " +
"Or set SPACK_DIRTY environment variable")
subparser.add_argument( subparser.add_argument(
'packages', nargs=argparse.REMAINDER, 'packages', nargs=argparse.REMAINDER,
help="specs of packages to install") help="specs of packages to install")
@ -88,5 +90,5 @@ def install(parser, args):
run_tests=args.run_tests, run_tests=args.run_tests,
verbose=args.verbose, verbose=args.verbose,
fake=args.fake, fake=args.fake,
dirty=args.dirty, dirty=args.dirty or ('SPACK_DIRTY' in os.environ),
explicit=True) explicit=True)

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

@ -46,6 +46,10 @@ def setup_parser(subparser):
subparser.add_argument( subparser.add_argument(
'spec', nargs=argparse.REMAINDER, 'spec', nargs=argparse.REMAINDER,
help="specs to use for install. Must contain package AND version.") help="specs to use for install. Must contain package AND version.")
subparser.add_argument(
'--dirty', action='store_true', dest='dirty',
help="Install a package *without* cleaning the environment. " +
"Or set SPACK_DIRTY environment variable")
def setup(self, args): def setup(self, args):
@ -91,4 +95,5 @@ def setup(self, args):
ignore_deps=args.ignore_deps, ignore_deps=args.ignore_deps,
verbose=args.verbose, verbose=args.verbose,
keep_stage=True, # don't remove source dir for SETUP. keep_stage=True, # don't remove source dir for SETUP.
install_phases=set(['setup', 'provenance'])) install_phases=set(['setup', 'provenance']),
dirty=args.dirty or ('SPACK_DIRTY' in os.environ))

3
lib/spack/spack/package.py
View File

@ -916,7 +916,8 @@ def do_install(self,
skip_patch=skip_patch, skip_patch=skip_patch,
verbose=verbose, verbose=verbose,
make_jobs=make_jobs, make_jobs=make_jobs,
run_tests=run_tests) run_tests=run_tests,
dirty=dirty)
# Set run_tests flag before starting build. # Set run_tests flag before starting build.
self.run_tests = run_tests self.run_tests = run_tests