dbb9ca6 Print merely conflict rules. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Print merely conflict rules.

Vsevolod Stakhov committed 10 years ago

commit dbb9ca63541f18b856f99f0baf114537bde84a7e
parent 4a2d928

1 file changed +8 -5

modified libpkg/pkg_solve.c

@@ -1085,12 +1085,15 @@ reiterate:

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