b41ee3a Fix install/delete order. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix install/delete order.

Vsevolod Stakhov committed 12 years ago

commit b41ee3a6d944a6ebf215f4ca18788cdf024af0c4
parent 2a4e70a

1 file changed +2 -2

modified libpkg/pkg_jobs.c

@@ -1172,10 +1172,10 @@ pkg_jobs_sort_priority(struct pkg_solved *r1, struct pkg_solved *r2)

 {
 	/* Always execute delete requests before install or upgrade */
 	if (r1->type == PKG_SOLVED_DELETE && r2->type != PKG_SOLVED_DELETE) {
 		return 1;
 		return -1;
 	}
 	else if (r1->type != PKG_SOLVED_DELETE && r2->type == PKG_SOLVED_DELETE) {
 		return -1;
 		return 1;
 	}
 	else if (r1->type == PKG_SOLVED_DELETE && r2->type == PKG_SOLVED_DELETE) {
 		/* Inverse deletion priority */