From bb62f71aa0b3e10e0766400f6839debccee5b82e Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 18 Dec 2023 09:52:12 +0100 Subject: [PATCH] asp.py: remove "CLI" reference (#41718) Can also be an environment root, or programatically `Spec("x").concretized()`. --- lib/spack/spack/solver/asp.py | 2 +- 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 e3068e7db46..17168908877 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -2680,7 +2680,7 @@ def literal_specs(self, specs): # 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")) # Effect imposes the spec imposed_spec_key = str(spec), None diff --git a/lib/spack/spack/test/concretize_errors.py b/lib/spack/spack/test/concretize_errors.py index 2a8be3e0457..3499fe63a90 100644 --- a/lib/spack/spack/test/concretize_errors.py +++ b/lib/spack/spack/test/concretize_errors.py @@ -16,8 +16,8 @@ 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 @@ " 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 = {