1dfc082 pkg add: PKG_FLAG_FORCE->PKG_ADD_FORCE: this is not a job flag, but a flag for add.c to get — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkg add: PKG_FLAG_FORCE->PKG_ADD_FORCE: this is not a job flag, but a flag for add.c to get

Elvira Khabirova committed 12 years ago

commit 1dfc082c85ccd28dc4729e89d8c3619b9b58270a
parent 7fdc14b

2 files changed +3 -3

modified libpkg/pkg_add.c

@@ -220,7 +220,7 @@ pkg_add(struct pkgdb *db, const char *path, unsigned flags,

 	ret = pkg_try_installed(db, origin, &pkg_inst, PKG_LOAD_BASIC);
 	if (ret == EPKG_OK) {
 		if ((flags & PKG_FLAG_FORCE) == 0) {
 		if ((flags & PKG_ADD_FORCE) == 0) {
 			pkg_emit_already_installed(pkg_inst);
 			retcode = EPKG_INSTALLED;
 			pkg_free(pkg_inst);

@@ -296,7 +296,7 @@ pkg_add(struct pkgdb *db, const char *path, unsigned flags,

 	/* register the package before installing it in case there are
 	 * problems that could be caught here. */
 	retcode = pkgdb_register_pkg(db, pkg, flags & PKG_ADD_UPGRADE, flags & PKG_FLAG_FORCE);
 	retcode = pkgdb_register_pkg(db, pkg, flags & PKG_ADD_UPGRADE, flags & PKG_ADD_FORCE);
 	if (retcode != EPKG_OK)
 		goto cleanup;

modified src/add.c

@@ -95,7 +95,7 @@ exec_add(int argc, char **argv)

 			f |= PKG_ADD_AUTOMATIC;
 			break;
 		case 'f':
 			f |= PKG_FLAG_FORCE;
 			f |= PKG_ADD_FORCE;
 			break;
 		case 'M':
 			f |= PKG_ADD_FORCE_MISSING;