Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d50f736
Check all external solvers at a single point in the code
Baptiste Daroussin committed 5 years ago
commit d50f73674ab6686739cff5c884a18f3f40e8e900
parent d76e66e
1 file changed +10 -10
modified libpkg/pkg_jobs.c
@@ -1790,7 +1790,7 @@ pkg_jobs_solve(struct pkg_jobs *j)
	int ret;

	struct pkg_solve_problem *problem;

	struct pkg_solved *job;
- 
	const char *solver, *dotfile;
+ 
	const char *cudf_solver, *sat_solver, *dotfile;

	FILE *dot = NULL;



	pkgdb_begin_solver(j->db);
@@ -1814,20 +1814,20 @@ pkg_jobs_solve(struct pkg_jobs *j)
		return (EPKG_FATAL);

	}
+ 
	cudf_solver = pkg_object_string(pkg_config_get("CUDF_SOLVER"));
+ 
	sat_solver = pkg_object_string(pkg_config_get("SAT_SOLVER"));
+ 


	if (ret == EPKG_OK) {
- 
		if ((solver = pkg_object_string(pkg_config_get("CUDF_SOLVER"))) != NULL) {
- 
			ret = solve_with_cudf_solver(j, solver);
- 
		}
- 
		else {
+ 
		if (cudf_solver != NULL) {
+ 
			ret = solve_with_cudf_solver(j, cudf_solver);
+ 
		} else {

again:
- 


			pkg_jobs_universe_process_upgrade_chains(j);

			problem = pkg_solve_jobs_to_sat(j);

			if (problem != NULL) {
- 
				if ((solver = pkg_object_string(pkg_config_get("SAT_SOLVER"))) != NULL) {
- 
					ret = solve_with_external_sat_solver(problem, solver);
- 
				}
- 
				else {
+ 
				if (sat_solver != NULL) {
+ 
					ret = solve_with_external_sat_solver(problem, sat_solver);
+ 
				} else {

					if ((dotfile = pkg_object_string(pkg_config_get("DOT_FILE")))

							!= NULL) {

						dot = fopen(dotfile, "w");