7a528a7 src: fix `pkg bootstrap -y` — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

src: fix `pkg bootstrap -y`

Isaac Freund committed 1 year ago

commit 7a528a707afc2b79b1ccd510982205d623bf5b0c
parent f6a4eb6

2 files changed +9 -2

modified src/main.c

@@ -736,7 +736,7 @@ main(int argc, char **argv)

 				break;
 			}
 		}
 		if (yes == 0 && force == 0) {
 		if (force == 0) {
 			printf("pkg(8) already installed, use -f to force.\n");
 			exit(EXIT_SUCCESS);
 		} else if (force == 1) {

modified tests/frontend/pkg.sh

@@ -7,7 +7,8 @@ tests_init \

 	pkg_config_defaults \
 	pkg_create_manifest_bad_syntax \
 	pkg_repo_load_order \
 	double_entry
 	double_entry \
 	bootstrap
 pkg_no_database_body() {
         atf_skip_on Linux Test fails on Linux

@@ -101,3 +102,9 @@ PKG_ENV : {

 EOF
 	atf_check -o ignore pkg -C ./pkg.conf -vv
 }
 bootstrap_body()
 {
 	atf_check -o ignore pkg bootstrap
 	atf_check -o ignore pkg bootstrap -y
 }