b650ba0 pkg_jobs: fix behaviour changed from 885cf0ddd08fd — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkg_jobs: fix behaviour changed from 885cf0ddd08fd

Baptiste Daroussin committed 1 year ago

commit b650ba01940d161d1fd046620130ce89c9a2456c
parent c4567bd

1 file changed +3 -1

modified libpkg/pkg_jobs.c

@@ -2216,9 +2216,11 @@ pkg_jobs_apply(struct pkg_jobs *j)

 			if (rc == EPKG_OK) {
 				bool found_conflicts = false;
 				rc = pkg_jobs_check_and_solve_conflicts(j, &found_conflicts);
 				if (rc != EPKG_OK)
 					return (rc);
 				if (found_conflicts) {
 					rc = EPKG_CONFLICT;
 				} else if (rc == EPKG_OK) {
 				} else {
 					rc = pkg_jobs_execute(j);
 				}
 			}