e3dd826 Fix internal solver call. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix internal solver call.

Vsevolod Stakhov committed 12 years ago

commit e3dd8263450929741c2f647e87ca2daaf558ed95
parent 8029c25

1 file changed +13 -5

modified libpkg/pkg_jobs.c

@@ -1028,13 +1028,21 @@ pkg_jobs_solve(struct pkg_jobs *j)

 					fclose(spipe[0]);
 					waitpid(pchild, &pstatus, WNOHANG);
 				}
 				else {
 					if (!pkg_solve_sat_problem(problem)) {
 						pkg_emit_error("cannot solve job using SAT solver");
 						ret = EPKG_FATAL;
 						j->solved = false;
 					}
 					else {
 						ret = pkg_solve_sat_to_jobs(problem, j);
 					}
 				}
 			}
 			else {
 				if (!pkg_solve_sat_problem (problem)) {
 					pkg_emit_error("cannot solve job using SAT solver");
 					ret = EPKG_FATAL;
 					j->solved = false;
 				}
 				pkg_emit_error("cannot convert job to SAT problem");
 				ret = EPKG_FATAL;
 				j->solved = false;
 			}
 		}
 	}