zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up post rebase

Browse Source
This commit is contained in:
Gregory Becker 2023-06-14 11:18:41 -07:00
parent c10797718a
commit 1b4ff30665
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/solver/asp.py
View File

@ -626,9 +626,9 @@ def _get_cause_tree(self, cause, conditions, condition_causes, literals, indent=
) )
] ]
def get_cause_tree(self, result, best_model, cause): def get_cause_tree(self, cause):
conditions = dict(extract_args(best_model, "condition")) conditions = dict(extract_args(self.model, "condition"))
condition_causes = list(extract_args(best_model, "condition_cause")) condition_causes = list(extract_args(self.model, "condition_cause"))
return self._get_cause_tree(cause, conditions, condition_causes, []) return self._get_cause_tree(cause, conditions, condition_causes, [])
def handle_error(self, msg, *args): def handle_error(self, msg, *args):

6
lib/spack/spack/solver/causation.lp
View File

@ -64,9 +64,9 @@ error(0, "Version '{0}' of {1} does not satisfy '@{2}'", Version, Virtual, Const
% More specific error message if the version cannot satisfy some constraint % More specific error message if the version cannot satisfy some constraint
% Otherwise covered by `no_version_error` and `versions_conflict_error`. % Otherwise covered by `no_version_error` and `versions_conflict_error`.
error(0, "No valid version for '{0}' satisfies '@{1}'", Package, Constraint, startcauses, ConstraintCause) error(0, "Cannot satisfy '{0}@{1}'", Package, Constraint, startcauses, ConstraintCause)
:- attr("node_version_satisfies", Package, Constraint), :- attr("node_version_satisfies", Package, Constraint),
imposed_constraint(ConstraintCause, "node_version_satisfies", Package, Constraint), imposed_constraint(ConstraintCause, "node_version_satisfies", Package, Constraint),
condition_holds(ConstraintCause), condition_holds(ConstraintCause),
C = #count{ Version : attr("version", Package, Version), version_satisfies(Package, Constraint, Version)}, attr("version", Package, Version),
C < 1. not version_satisfies(Package, Constraint, Version).