b19a031 Revert "pkg_jobs: fix behaviour changed from 885cf0ddd08fd" — HardenedBSD-pkg

HardenedBSD Package Manager

Revert "pkg_jobs: fix behaviour changed from 885cf0ddd08fd"

Baptiste Daroussin committed 1 year ago

commit b19a03123350ad8eb9484c9f584862200c8f114a
parent 7a0cf341e850e5136338bac2c85e6151686f53d4

1 file changed +1 -3

modified libpkg/pkg_jobs.c

@@ -2216,11 +2216,9 @@ 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 {
 				} else if (rc == EPKG_OK) {
 					rc = pkg_jobs_execute(j);
 				}
 			}