e65c7f7 Do not guess assumptions. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Do not guess assumptions.

Vsevolod Stakhov committed 11 years ago

commit e65c7f72e008a5a25585ee9e7afe149e30eadbff
parent 997ece7

1 file changed +5 -0

modified libpkg/pkg_solve.c

@@ -910,6 +910,8 @@ pkg_solve_add_unary_rule(struct pkg_solve_problem *problem,

 		inverse < 0 ? "delete" : "install", var->uid, var->digest);
 	picosat_assume(problem->sat, var->order * inverse);
 	var->top_level = true;
 	var->to_install = inverse > 0;
 	problem->rules_count ++;
 	return (EPKG_OK);

@@ -1131,6 +1133,9 @@ pkg_solve_sat_problem(struct pkg_solve_problem *problem)

 		struct pkg_solve_variable *var = &problem->variables[i];
 		bool is_installed = var->unit->pkg->type == PKG_INSTALLED;
 		if (var->top_level)
 			continue;
 		if (is_installed) {
 			picosat_set_default_phase_lit(problem->sat, i + 1, 1);
 			picosat_set_more_important_lit(problem->sat, i + 1);