7acb579 Merge pull request #1297 from andrejzverev/fix2 — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge pull request #1297 from andrejzverev/fix2

Baptiste Daroussin committed 10 years ago

commit 7acb5795c2aedb5618cb58b0e9d12a737ffe4b92
parent 59f9f8c

1 file changed +2 -2

modified libpkg/pkg_solve.c

@@ -234,8 +234,8 @@ pkg_print_rule_sbuf(struct pkg_solve_rule *rule, struct sbuf *sb)

 		break;
 	case PKG_RULE_UPGRADE_CONFLICT:
 		sbuf_printf(sb, "upgrade local %s-%s to remote %s-%s",
 			it->next->var->uid, it->next->var->unit->pkg->version,
 			it->var->uid, it->var->unit->pkg->version);
 			it->var->uid, it->var->unit->pkg->version,
 			it->next->var->uid, it->next->var->unit->pkg->version);
 		break;
 	case PKG_RULE_EXPLICIT_CONFLICT:
 		sbuf_printf(sb, "The following packages conflict with each other: ");