Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 62e6287
libpkg: Simplify some logic in pkg_add_common()
Mark Johnston committed 3 years ago
commit 62e6287d2311a431b8b171c2456182ef5c970a0a
parent 5754614
1 file changed +4 -8
modified libpkg/pkg_add.c
@@ -1211,16 +1211,12 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
		retcode = ret;

		goto cleanup;

	}
- 
	if ((flags & PKG_ADD_SPLITTED_UPGRADE) != PKG_ADD_SPLITTED_UPGRADE)
+ 
	if ((flags & PKG_ADD_SPLITTED_UPGRADE) == 0)

		pkg_emit_new_action();
- 
	if ((flags & PKG_ADD_UPGRADE) == 0)
+ 
	if ((flags & PKG_ADD_UPGRADE) == 0 || local == NULL)

		pkg_emit_install_begin(pkg);
- 
	else {
- 
		if (local != NULL)
- 
			pkg_emit_upgrade_begin(pkg, local);
- 
		else
- 
			pkg_emit_install_begin(pkg);
- 
	}
+ 
	else
+ 
		pkg_emit_upgrade_begin(pkg, local);



	if (pkg_is_valid(pkg) != EPKG_OK) {

		pkg_emit_error("the package is not valid");