summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2024-05-03 21:12:36 +0200
committerGitHub <noreply@github.com>2024-05-03 12:12:36 -0700
commitd2ed2177966d1c7c125167291709dc9e67d06e1d (patch)
tree199e75f7c280be40842c280871f59c6a56ebf781 /lib
parent272c7c069a9d148b55a531316c397eaf179f5574 (diff)
downloadspack-d2ed2177966d1c7c125167291709dc9e67d06e1d.tar.gz
spack-d2ed2177966d1c7c125167291709dc9e67d06e1d.tar.bz2
spack-d2ed2177966d1c7c125167291709dc9e67d06e1d.tar.xz
spack-d2ed2177966d1c7c125167291709dc9e67d06e1d.zip
concretizer args: --fresh-roots == --reuse-deps (#43988)
Since reuse is the default now, `--reuse-deps` can be confusing, as it technically does not imply roots are fresh. So add `--fresh-roots`, which is also easier to discover when running `spack concretize --fre<tab>`
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/cmd/common/arguments.py3
-rw-r--r--lib/spack/spack/test/cmd/common/arguments.py8
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/spack/spack/cmd/common/arguments.py b/lib/spack/spack/cmd/common/arguments.py
index ab9f893980..aa652919f8 100644
--- a/lib/spack/spack/cmd/common/arguments.py
+++ b/lib/spack/spack/cmd/common/arguments.py
@@ -563,12 +563,13 @@ def add_concretizer_args(subparser):
help="reuse installed packages/buildcaches when possible",
)
subgroup.add_argument(
+ "--fresh-roots",
"--reuse-deps",
action=ConfigSetAction,
dest="concretizer:reuse",
const="dependencies",
default=None,
- help="reuse installed dependencies only",
+ help="concretize with fresh roots and reused dependencies",
)
subgroup.add_argument(
"--deprecated",
diff --git a/lib/spack/spack/test/cmd/common/arguments.py b/lib/spack/spack/test/cmd/common/arguments.py
index 3d2deac479..b7d018210b 100644
--- a/lib/spack/spack/test/cmd/common/arguments.py
+++ b/lib/spack/spack/test/cmd/common/arguments.py
@@ -123,7 +123,13 @@ def test_root_and_dep_match_returns_root(mock_packages, mutable_mock_env_path):
@pytest.mark.parametrize(
- "arg,conf", [("--reuse", True), ("--fresh", False), ("--reuse-deps", "dependencies")]
+ "arg,conf",
+ [
+ ("--reuse", True),
+ ("--fresh", False),
+ ("--reuse-deps", "dependencies"),
+ ("--fresh-roots", "dependencies"),
+ ],
)
def test_concretizer_arguments(mutable_config, mock_packages, arg, conf):
"""Ensure that ConfigSetAction is doing the right thing."""