From 0ab30d61795a770d4f22ba58b83a02d9ab146281 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 30 Jul 2009 07:31:06 +0000 Subject: Inside die(), only send the signal for subshell die support when we are actually in a subshell. svn path=/main/trunk/; revision=13857 --- bin/isolated-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 8bc6f17fc..83270506c 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -150,7 +150,7 @@ die() { [ -n "$EBUILD_EXIT_STATUS_FILE" ] && > "$EBUILD_EXIT_STATUS_FILE" # subshell die support - kill -s SIGTERM ${EBUILD_MASTER_PID} + [[ $BASHPID = $EBUILD_MASTER_PID ]] || kill -s SIGTERM $EBUILD_MASTER_PID exit 1 } -- cgit v1.2.3-1-g7c22