1e6b3e1 Check for request conflicts during upgrade. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Check for request conflicts during upgrade.

Vsevolod Stakhov committed 12 years ago

commit 1e6b3e1b8a0694db7d7e8f0047335966411313d4
parent 186205a

1 file changed +5 -0

modified libpkg/pkg_jobs.c

@@ -505,6 +505,11 @@ jobs_solve_upgrade(struct pkg_jobs *j)

 	}
 	pkgdb_it_free(it);
 	if (pkg_conflicts_request_resolve(j) != EPKG_OK) {
 		pkg_emit_error("Cannot resolve conflicts in a request");
 		return (EPKG_FATAL);
 	}
 order:
 	j->solved = true;