Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 9886217
Revert "Take PKG_ATTR_{VITAL,LOCKED} into account when solving for pkg upgrade."
Baptiste Daroussin committed 2 years ago
commit 9886217b33e461989ad2a8a9216f807bb0db7a0a
parent 619b115
1 file changed +0 -28
modified libpkg/pkg_solve.c
@@ -1,7 +1,5 @@
/*-

 * Copyright (c) 2013-2017 Vsevolod Stakhov <vsevolod@FreeBSD.org>
- 
 * Copyright (c) 2024 Serenity Cyber Security, LLC <license@futurecrew.ru>
- 
 *                    Author: Gleb Popov <arrowd@FreeBSD.org>

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -55,7 +53,6 @@ enum pkg_solve_rule_type {
	PKG_RULE_REQUEST_CONFLICT,

	PKG_RULE_REQUEST,

	PKG_RULE_REQUIRE,
- 
	PKG_RULE_VITAL,

	PKG_RULE_MAX

};
@@ -66,7 +63,6 @@ static const char *rule_reasons[] = {
	[PKG_RULE_EXPLICIT_CONFLICT] = "conflict",

	[PKG_RULE_REQUEST] = "request",

	[PKG_RULE_REQUIRE] = "require",
- 
	[PKG_RULE_VITAL] = "vital",

	[PKG_RULE_MAX] = NULL

};
@@ -248,10 +244,6 @@ pkg_print_rule_buf(struct pkg_solve_rule *rule, xstring *sb)
					it->next ? ", " : "");

		}

		break;
- 
	case PKG_RULE_VITAL:
- 
		fprintf(sb->fp, "The following package is marked vital: %s-%s",
- 
				rule->items->var->uid, rule->items->var->unit->pkg->version);
- 
		break;

	default:

		break;

	}
@@ -629,17 +621,6 @@ pkg_solve_add_chain_rule(struct pkg_solve_problem *problem,
}



static int
- 
pkg_solve_add_vital_rule(struct pkg_solve_problem *problem,
- 
	struct pkg_solve_variable *var)
- 
{
- 
	struct pkg_solve_rule* rule = pkg_solve_rule_new(PKG_RULE_VITAL);
- 
	pkg_solve_item_new(rule, var, 1);
- 
	tll_push_front(problem->rules, rule);
-
- 
	return (EPKG_OK);
- 
}
-
- 
static int

pkg_solve_process_universe_variable(struct pkg_solve_problem *problem,

		struct pkg_solve_variable *var)

{
@@ -650,7 +631,6 @@ pkg_solve_process_universe_variable(struct pkg_solve_problem *problem,
	struct pkg_jobs *j = problem->j;

	struct pkg_job_request *jreq = NULL;

	bool chain_added = false;
- 
	bool force = j->flags & PKG_FLAG_FORCE;



	LL_FOREACH(var, cur_var) {

		pkg = cur_var->unit->pkg;
@@ -669,10 +649,6 @@ pkg_solve_process_universe_variable(struct pkg_solve_problem *problem,
			cur_var->assumed_reponame = pkg->reponame;

		}
- 
		if (pkg->locked || (pkg->vital && !force)) {
- 
			pkg_solve_add_vital_rule(problem, cur_var);
- 
		}
- 


		/* Depends */

		LL_FOREACH(pkg->depends, dep) {

			if (pkg_solve_add_depend_rule(problem, cur_var, dep,
@@ -970,10 +946,6 @@ pkg_solve_set_initial_assumption(struct pkg_solve_problem *problem,
	case PKG_RULE_REQUIRE:

		/* XXX: deal with require rules somehow */

		break;
- 
	case PKG_RULE_VITAL:
- 
		var = item->var;
- 
		picosat_set_default_phase_lit(problem->sat, var->order, 1);
- 
		break;

	default:

		/* No nothing */

		return;