diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-07-30 07:31:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-07-30 07:31:06 +0000 |
| commit | 0ab30d61795a770d4f22ba58b83a02d9ab146281 (patch) | |
| tree | 85021097ea736334235421b7423b08d7d958f38d | |
| parent | 2c448fe6d4182f4b154f941adabfccbdea2936bc (diff) | |
| download | portage-0ab30d61795a770d4f22ba58b83a02d9ab146281.tar.gz portage-0ab30d61795a770d4f22ba58b83a02d9ab146281.tar.bz2 portage-0ab30d61795a770d4f22ba58b83a02d9ab146281.zip | |
Inside die(), only send the signal for subshell die support when we are
actually in a subshell.
svn path=/main/trunk/; revision=13857
| -rwxr-xr-x | bin/isolated-functions.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |