From 98f9dd266fe53444c77bcb6b810dda788c1fa558 Mon Sep 17 00:00:00 2001
From: Elizabeth Fischer <rpf2116@columbia.edu>
Date: Thu, 22 Sep 2016 03:43:33 -0400
Subject: [PATCH] Remove SPACK_DIRTY env var (#1818)
* Removed SPACK_DIRTY env var support.
* Finished removing SPACK_DIRTY support.
* Minor changes.
---
lib/spack/spack/cmd/diy.py | 5 ++---
lib/spack/spack/cmd/install.py | 6 ++----
lib/spack/spack/cmd/setup.py | 5 ++---
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/lib/spack/spack/cmd/diy.py b/lib/spack/spack/cmd/diy.py
index 1a3e2fd65c..9833e8cdce 100644
--- a/lib/spack/spack/cmd/diy.py
+++ b/lib/spack/spack/cmd/diy.py
@@ -54,8 +54,7 @@ def setup_parser(subparser):
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")
+ help="Install a package *without* cleaning the environment.")
def diy(self, args):
@@ -105,4 +104,4 @@ def diy(self, args):
ignore_deps=args.ignore_deps,
verbose=not args.quiet,
keep_stage=True, # don't remove source dir for DIY.
- dirty=args.dirty or ('SPACK_DIRTY' in os.environ))
+ dirty=args.dirty)
diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py
index a77af37ed0..7663a97a28 100644
--- a/lib/spack/spack/cmd/install.py
+++ b/lib/spack/spack/cmd/install.py
@@ -28,7 +28,6 @@
import spack
import spack.cmd
-import os
description = "Build and install packages"
@@ -57,8 +56,7 @@ def setup_parser(subparser):
help="Fake install. Just remove prefix and create a fake file.")
subparser.add_argument(
'--dirty', action='store_true', dest='dirty',
- help="Install a package *without* cleaning the environment. " +
- "Or set SPACK_DIRTY environment variable")
+ help="Install a package *without* cleaning the environment.")
subparser.add_argument(
'packages', nargs=argparse.REMAINDER,
help="specs of packages to install")
@@ -90,5 +88,5 @@ def install(parser, args):
run_tests=args.run_tests,
verbose=args.verbose,
fake=args.fake,
- dirty=args.dirty or ('SPACK_DIRTY' in os.environ),
+ dirty=args.dirty,
explicit=True)
diff --git a/lib/spack/spack/cmd/setup.py b/lib/spack/spack/cmd/setup.py
index 66095ee628..4dfa13eccf 100644
--- a/lib/spack/spack/cmd/setup.py
+++ b/lib/spack/spack/cmd/setup.py
@@ -48,8 +48,7 @@ def setup_parser(subparser):
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")
+ help="Install a package *without* cleaning the environment.")
def setup(self, args):
@@ -96,4 +95,4 @@ def setup(self, args):
verbose=args.verbose,
keep_stage=True, # don't remove source dir for SETUP.
install_phases=set(['setup', 'provenance']),
- dirty=args.dirty or ('SPACK_DIRTY' in os.environ))
+ dirty=args.dirty)
--
GitLab