Don't ignore failed pre-install/post-install scripts/lua files in pkg…

…-register(8) (#2073) When a package is registered through pkg-register(8) the return codes of pre-install and post-install scripts and lua files are ignored. Now they are respected as with pkg-add(8). This fixes #2073
freebsd · Mar 1, 2023 · 67a76e6 · 67a76e6
1 parent 6c55d7b
commit 67a76e6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/libpkg/pkg_add.c b/libpkg/pkg_add.c
@@ -1357,8 +1357,10 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
 	if (retcode != EPKG_OK)
 		goto cleanup;
 	if ((flags & PKG_ADD_NOSCRIPT) == 0) {
-		pkg_lua_script_run(pkg, PKG_LUA_POST_INSTALL, (local != NULL));
-		pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL, (local != NULL));
+		if ((retcode = pkg_lua_script_run(pkg, PKG_LUA_POST_INSTALL, (local != NULL))) != EPKG_OK)
+			goto cleanup;
+		if ((retcode = pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL, (local != NULL))) != EPKG_OK)
+			goto cleanup;
 	}
 
 	/*

diff --git a/libpkg/pkg_ports.c b/libpkg/pkg_ports.c
@@ -1214,8 +1214,10 @@ pkg_add_port(struct pkgdb *db, struct pkg *pkg, const char *input_path,
 
 	if (!testing) {
 		/* Execute pre-install scripts */
-		pkg_lua_script_run(pkg, PKG_LUA_PRE_INSTALL, false);
-		pkg_script_run(pkg, PKG_SCRIPT_PRE_INSTALL, false);
+		if ((rc = pkg_lua_script_run(pkg, PKG_LUA_PRE_INSTALL, false)) != EPKG_OK)
+			goto cleanup;
+		if ((rc = pkg_script_run(pkg, PKG_SCRIPT_PRE_INSTALL, false)) != EPKG_OK)
+			goto cleanup;
 
 		if (input_path != NULL) {
 			pkg_register_cleanup_callback(pkg_rollback_cb, pkg);
@@ -1229,8 +1231,10 @@ pkg_add_port(struct pkgdb *db, struct pkg *pkg, const char *input_path,
 		}
 
 		/* Execute post-install scripts */
-		pkg_lua_script_run(pkg, PKG_LUA_POST_INSTALL, false);
-		pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL, false);
+		if ((rc = pkg_lua_script_run(pkg, PKG_LUA_POST_INSTALL, false)) != EPKG_OK)
+			goto cleanup;
+		if ((rc = pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL, false)) != EPKG_OK)
+			goto cleanup;
 	}
 
 	if (rc == EPKG_OK) {

diff --git a/tests/frontend/install.sh b/tests/frontend/install.sh
@@ -6,7 +6,7 @@ tests_init \
 	metalog \
 	reinstall \
 	pre_script_fail \
-	post_script_ignored \
+	post_script_fail \
 	install_missing_dep
 
 test_setup()
@@ -150,7 +150,7 @@ EOF
 		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.pkg
 }
 
-post_script_ignored_body()
+post_script_fail_body()
 {
 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
 	cat << EOF >> test.ucl
@@ -167,7 +167,7 @@ EOF
 
 	atf_check -o ignore \
 		-e inline:"${PROGNAME}: POST-INSTALL script failed\n" \
-		-s exit:0 \
+		-s exit:3 \
 		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.pkg
 }
 

diff --git a/tests/frontend/lua.sh b/tests/frontend/lua.sh
@@ -221,7 +221,7 @@ pkg: lua script failed\n"
 	mkdir -p ${TMPDIR}/target
 	atf_check \
 		-e inline:"${ERR}" \
-		-s exit:0 \
+		-s exit:3 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }