d46ea9d pkg_add: do not emit error on installed packages — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkg_add: do not emit error on installed packages

Franco Fichtner committed 11 years ago

commit d46ea9d2b766e9620081cc84a827c884c719807e
parent 45579c6

1 file changed +3 -2

modified libpkg/pkg_add.c

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

 			pkg_emit_locked(pkg_inst);
 			pkg_free(pkg_inst);
 			pkg_inst = NULL;
 			return (EPKG_INSTALLED);
 			return (EPKG_LOCKED);
 		}
 		else {
 			pkg_emit_notice("package %s is already installed, forced install",

@@ -481,7 +481,8 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,

 	if (remote == NULL) {
 		ret = pkg_add_check_pkg_archive(db, pkg, path, flags, keys, location);
 		if (ret != EPKG_OK) {
 			retcode = ret;
 			/* Do not return error on installed package */
 			retcode = (ret == EPKG_INSTALLED ? EPKG_OK : ret);
 			goto cleanup;
 		}
 	}