18070ea Check if a package is already installed by name, not by origin — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Check if a package is already installed by name, not by origin

Baptiste Daroussin committed 10 years ago

commit 18070eaf0b846bbee6c41d61aea69a979f33e202
parent 329c214

2 files changed +3 -3

modified libpkg/pkg.c

@@ -1644,12 +1644,12 @@ pkg_recompute(struct pkgdb *db, struct pkg *pkg)

 }
 int
 pkg_try_installed(struct pkgdb *db, const char *origin,
 pkg_try_installed(struct pkgdb *db, const char *names,
 		struct pkg **pkg, unsigned flags) {
 	struct pkgdb_it *it = NULL;
 	int ret = EPKG_FATAL;
 	if ((it = pkgdb_query(db, origin, MATCH_EXACT)) == NULL)
 	if ((it = pkgdb_query(db, name, MATCH_EXACT)) == NULL)
 		return (EPKG_FATAL);
 	ret = pkgdb_it_next(it, pkg, flags);

modified libpkg/pkg_add.c

@@ -411,7 +411,7 @@ pkg_add_check_pkg_archive(struct pkgdb *db, struct pkg *pkg,

 	}
 	/* XX check */
 	ret = pkg_try_installed(db, pkg->origin, &pkg_inst, PKG_LOAD_BASIC);
 	ret = pkg_try_installed(db, pkg->name, &pkg_inst, PKG_LOAD_BASIC);
 	if (ret == EPKG_OK) {
 		if ((flags & PKG_ADD_FORCE) == 0) {
 			pkg_emit_already_installed(pkg_inst);