Fix updating of jail.

Broken by e4036cb for issue #544. Fixes #555
freebsd · Nov 29, 2017 · 9d89fed · 9d89fed
1 parent d4e83da
commit 9d89fed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
@@ -501,7 +501,7 @@ do_confirm_delete() {
 }
 
 injail() {
-	if [ ${STATUS:-0} -eq 0 ]; then
+	if [ ${INJAIL_HOST:-0} -eq 1 ]; then
 		# For test/
 		"$@"
 	elif [ "${USE_JEXECD}" = "no" ]; then

diff --git a/test/common.bulk.sh b/test/common.bulk.sh
@@ -205,6 +205,8 @@ assert_queued() {
 export __MAKE_CONF=/dev/null
 export SRCCONF=/dev/null
 export SRC_ENV_CONF=/dev/null
+# Avoid injail() for port_var_fetch
+INJAIL_HOST=1
 
 . common.sh
 

diff --git a/test/port_var_fetch.sh b/test/port_var_fetch.sh
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 . common.sh
+INJAIL_HOST=1
 . ${SCRIPTPREFIX}/common.sh
 PORTSDIR=${THISDIR}/ports
 export PORTSDIR