hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

asp.py: remove "CLI" reference (#41718)

Browse source 
Can also be an environment root, or programatically
`Spec("x").concretized()`.
This commit is contained in:
Harmen Stoppels 2023-12-18 09:52:12 +01:00
parent fff8e16cdd
commit bb62f71aa0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/spack/spack/solver/asp.py
View file

@ -2680,7 +2680,7 @@ def literal_specs(self, specs):
# Special condition triggered by "literal_solved" # Special condition triggered by "literal_solved"
self.gen.fact(fn.literal(trigger_id)) 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.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 # Effect imposes the spec
imposed_spec_key = str(spec), None imposed_spec_key = str(spec), None

10
lib/spack/spack/test/concretize_errors.py
View file

@ -16,8 +16,8 @@
version_error_messages = [ version_error_messages = [
"Cannot satisfy 'fftw@:1.0' and 'fftw@1.1:", "Cannot satisfy 'fftw@:1.0' and 'fftw@1.1:",
" required because quantum-espresso depends on fftw@:1.0", " 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 explicitly",
" required because quantum-espresso ^fftw@1.1: requested from CLI", " required because quantum-espresso ^fftw@1.1: requested explicitly",
] ]
external_error_messages = [ external_error_messages = [
@ -30,15 +30,15 @@
" which was not satisfied" " which was not satisfied"
), ),
" 'quantum-espresso+veritas' required", " 'quantum-espresso+veritas' required",
" required because quantum-espresso+veritas requested from CLI", " required because quantum-espresso+veritas requested explicitly",
] ]
variant_error_messages = [ variant_error_messages = [
"'fftw' required multiple values for single-valued variant 'mpi'", "'fftw' required multiple values for single-valued variant 'mpi'",
" Requested '~mpi' and '+mpi'", " Requested '~mpi' and '+mpi'",
" required because quantum-espresso depends on fftw+mpi when +invino", " 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 explicitly",
" required because quantum-espresso+invino ^fftw~mpi requested from CLI", " required because quantum-espresso+invino ^fftw~mpi requested explicitly",
] ]
external_config = { external_config = {