b1cdcc4 Checking that a bit is unset using XOR? That's just not right. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Checking that a bit is unset using XOR? That's just not right.

Matthew Seaman committed 13 years ago

commit b1cdcc4ecca20a3729dc5af1f9b1fff0f71fa6b4
parent 5f7c9be

1 file changed +3 -3

modified libpkg/pkg_delete.c

@@ -77,7 +77,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, int flags)

 	/* If there are dependencies */
 	if (pkg_rdeps(pkg, &rdep) == EPKG_OK) {
 		pkg_emit_required(pkg, flags & PKG_DELETE_FORCE);
 		if (flags ^ PKG_DELETE_FORCE)
 		if ((flags & PKG_DELETE_FORCE) == 0)
 			return (EPKG_REQUIRED);
 	}

@@ -102,7 +102,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, int flags)

 	if ((ret = pkg_delete_files(pkg, flags & PKG_DELETE_FORCE)) != EPKG_OK)
 		return (ret);
 	if (flags ^ PKG_DELETE_UPGRADE) {
 	if ((flags & PKG_DELETE_UPGRADE) == 0) {
 		ret = pkg_script_run(pkg, PKG_SCRIPT_POST_DEINSTALL);
 		if (ret != EPKG_OK)
 			return (ret);

@@ -112,7 +112,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, int flags)

 	if (ret != EPKG_OK)
 		return (ret);
 	if (flags ^ PKG_DELETE_UPGRADE)
 	if ((flags & PKG_DELETE_UPGRADE) == 0)
 		pkg_emit_deinstall_finished(pkg);
 	pkg_get(pkg, PKG_ORIGIN, &origin);