832e256 Fix rules printing. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix rules printing.

Vsevolod Stakhov committed 10 years ago

commit 832e2568beb343d83faf92c78a3da4905d8375e9
parent beaf872

1 file changed +2 -3

modified libpkg/pkg_solve.c

@@ -446,7 +446,6 @@ pkg_solve_add_conflict_rule(struct pkg_solve_problem *problem,

 			if (other->type == PKG_INSTALLED)
 				continue;
 		}
 		/*
 		 * Also if a conflict is digest specific then we skip
 		 * variables with mismatched digests

@@ -1086,13 +1085,13 @@ reiterate:

 			for (i = 0; i < kv_size(problem->rules); i++) {
 				rule = kv_A(problem->rules, i);
 				if (rule->reason == PKG_RULE_EXPLICIT_CONFLICT) {
 				if (rule->reason != PKG_RULE_DEPEND) {
 					LL_FOREACH(rule->items, item) {
 						if (item->var == var) {
 							pkg_print_rule_sbuf(rule, sb);
 							sbuf_putc(sb, '\n');
 							break;
 						}
 						break;
 					}
 				}
 			}