498ee1a Fix output of conflicst checking. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix output of conflicst checking.

Vsevolod Stakhov committed 12 years ago

commit 498ee1a9fd2905c8c36a334d3fc6e17ce477c42f
parent 7f3e762

1 file changed +3 -1

modified libpkg/pkg_jobs.c

@@ -1646,8 +1646,10 @@ pkg_jobs_check_conflicts(struct pkg_jobs *j)

 	pkg_free(pkg);
 	if (added > 0 && ret != EPKG_FATAL) {
 		if ((res = pkg_conflicts_integrity_check(j)) != EPKG_OK)
 		if ((res = pkg_conflicts_integrity_check(j)) != EPKG_OK) {
 			pkg_emit_integritycheck_finished();
 			return (res);
 		}
 	}
 	pkg_emit_integritycheck_finished();