c016224 Fix self upgrade loop, again, with pkg upgrade -Fy — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix self upgrade loop, again, with pkg upgrade -Fy

Bryan Drewery committed 11 years ago

commit c01622414e549aa268ed740e5094eb25e06eaff3
parent 2f55baa

1 file changed +3 -1

modified libpkg/pkg_jobs.c

@@ -1330,7 +1330,9 @@ jobs_solve_install_upgrade(struct pkg_jobs *j)

 			PKG_LOAD_SHLIBS_REQUIRED|PKG_LOAD_ANNOTATIONS|PKG_LOAD_CONFLICTS;
 	struct pkg_jobs_install_candidate *candidates, *c;
 	if ((j->flags & PKG_FLAG_PKG_VERSION_TEST) == PKG_FLAG_PKG_VERSION_TEST)
 	/* Check for new pkg. Skip for 'upgrade -F'. */
 	if ((j->flags & PKG_FLAG_SKIP_INSTALL) == 0 &&
 	    (j->flags & PKG_FLAG_PKG_VERSION_TEST) == PKG_FLAG_PKG_VERSION_TEST)
 		if (new_pkg_version(j)) {
 			pkg_emit_newpkgversion();
 			goto order;