3298861 Further improve logic of failed vars. — HardenedBSD-pkg

HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Further improve logic of failed vars.

Vsevolod Stakhov committed 11 years ago

commit 32988619938fb26de8558e29cccc764456fea0d2
parent 24b137b

2 files changed +38 -20

modified libpkg/pkg_event.c

@@ -937,8 +937,8 @@ pkg_debug(int level, const char *fmt, ...)

 	struct pkg_event ev;
 	va_list ap;
 	if (debug_level < level)
 		return;
 	//if (debug_level < level)
 	//	return;
 	ev.type = PKG_EVENT_DEBUG;
 	ev.e_debug.level = level;

modified libpkg/pkg_solve.c

@@ -71,6 +71,7 @@ struct pkg_solve_variable {

 	struct pkg_job_universe_item *unit;
 	bool to_install;
 	bool top_level;
 	bool failed;
 	int priority;
 	const char *digest;
 	const char *uid;

@@ -896,9 +897,10 @@ pkg_solve_picosat_iter(struct pkg_solve_problem *problem, int iter)

 				/* Prefer not to install if have no local version */
 				picosat_set_default_phase_lit(problem->sat, i + 1, -1);
 			}
 			else if (iter > 0) {
 			else if (var->failed) {
 				/* Prefer to upgrade if possible */
 				picosat_set_default_phase_lit(problem->sat, i + 1, 1);
 				var->failed = false;
 			}
 			picosat_set_less_important_lit(problem->sat, i + 1);
 		}

@@ -989,8 +991,7 @@ reiterate:

 	/* Assign vars */
 	for (i = 0; i < problem->nvars; i ++) {
 		int val = picosat_deref(problem->sat, i + 1);
 		struct pkg_solve_variable *var = &problem->variables[i], *cur;
 		bool is_installed = false;
 		struct pkg_solve_variable *var = &problem->variables[i];
 		if (val > 0)
 			var->to_install = true;

@@ -1002,24 +1003,41 @@ reiterate:

 			var->uid, var->digest,
 			var->priority,
 			var->to_install ? "install" : "delete");
 	}
 		/*
 		 * If we want to delete local packages on installation, do one more SAT
 		 * iteration to ensure that we have no other choices
 		 */
 		LL_FOREACH(var, cur) {
 			if (cur->unit->pkg->type == PKG_INSTALLED) {
 				is_installed = true;
 				break;
 	/* Check for reiterations */
 	if ((problem->j->type == PKG_JOBS_INSTALL ||
 			problem->j->type == PKG_JOBS_UPGRADE) && iter == 0) {
 		for (i = 0; i < problem->nvars; i ++) {
 			bool failed_var = false;
 			struct pkg_solve_variable *var = &problem->variables[i], *cur;
 			if (!var->to_install) {
 				LL_FOREACH(var, cur) {
 					if (cur->to_install) {
 						failed_var = false;
 						break;
 					}
 					else if (cur->unit->pkg->type == PKG_INSTALLED) {
 						failed_var = true;
 					}
 				}
 			}
 		}
 		if (!need_reiterate && !var->to_install && is_installed &&
 			(problem->j->type == PKG_JOBS_INSTALL ||
 			problem->j->type == PKG_JOBS_UPGRADE) && iter == 0) {
 			pkg_debug (1, "trying to delete local packages on install/upgrade,"
 					" retiterate on SAT");
 			need_reiterate = true;
 			/*
 			 * If we want to delete local packages on installation, do one more SAT
 			 * iteration to ensure that we have no other choices
 			 */
 			if (failed_var) {
 				pkg_debug (1, "trying to delete local package %s-%s on install/upgrade,"
 					" retiterate on SAT",
 					var->unit->pkg->name, var->unit->pkg->version);
 				need_reiterate = true;
 				LL_FOREACH(var, cur) {
 					cur->failed = true;
 				}
 			}
 		}
 	}