diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2023-12-18 09:52:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 09:52:12 +0100 |
| commit | ebb7c5ac8f159bba674582b071cc63c618eebde7 (patch) | |
| tree | a48778b6f0cab84b623b3b1344a1f0c8f79e12d4 /lib | |
| parent | 14c7bfe9cedaa779717852aef6520761ffe95cd3 (diff) | |
| download | spack-ebb7c5ac8f159bba674582b071cc63c618eebde7.tar.gz spack-ebb7c5ac8f159bba674582b071cc63c618eebde7.tar.bz2 spack-ebb7c5ac8f159bba674582b071cc63c618eebde7.tar.xz spack-ebb7c5ac8f159bba674582b071cc63c618eebde7.zip | |
asp.py: remove "CLI" reference (#41718)
Can also be an environment root, or programatically
`Spec("x").concretized()`.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/solver/asp.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/test/concretize_errors.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index 4d9b5a0c39..13fe2ef156 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -2697,7 +2697,7 @@ class SpackSolverSetup: # Special condition triggered by "literal_solved" self.gen.fact(fn.literal(trigger_id)) self.gen.fact(fn.pkg_fact(spec.name, fn.condition_trigger(condition_id, trigger_id))) - self.gen.fact(fn.condition_reason(condition_id, f"{spec} requested from CLI")) + self.gen.fact(fn.condition_reason(condition_id, f"{spec} requested explicitly")) imposed_spec_key = str(spec), None cache = self._effect_cache[spec.name] diff --git a/lib/spack/spack/test/concretize_errors.py b/lib/spack/spack/test/concretize_errors.py index 2a8be3e045..3499fe63a9 100644 --- a/lib/spack/spack/test/concretize_errors.py +++ b/lib/spack/spack/test/concretize_errors.py @@ -16,8 +16,8 @@ pytestmark = [ version_error_messages = [ "Cannot satisfy 'fftw@:1.0' and 'fftw@1.1:", " required because quantum-espresso depends on fftw@:1.0", - " required because quantum-espresso ^fftw@1.1: requested from CLI", - " required because quantum-espresso ^fftw@1.1: requested from CLI", + " required because quantum-espresso ^fftw@1.1: requested explicitly", + " required because quantum-espresso ^fftw@1.1: requested explicitly", ] external_error_messages = [ @@ -30,15 +30,15 @@ external_error_messages = [ " which was not satisfied" ), " 'quantum-espresso+veritas' required", - " required because quantum-espresso+veritas requested from CLI", + " required because quantum-espresso+veritas requested explicitly", ] variant_error_messages = [ "'fftw' required multiple values for single-valued variant 'mpi'", " Requested '~mpi' and '+mpi'", " required because quantum-espresso depends on fftw+mpi when +invino", - " required because quantum-espresso+invino ^fftw~mpi requested from CLI", - " required because quantum-espresso+invino ^fftw~mpi requested from CLI", + " required because quantum-espresso+invino ^fftw~mpi requested explicitly", + " required because quantum-espresso+invino ^fftw~mpi requested explicitly", ] external_config = { |