| 1 |
Author: zmedico |
| 2 |
Date: 2009-07-30 07:31:06 +0000 (Thu, 30 Jul 2009) |
| 3 |
New Revision: 13857 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/isolated-functions.sh |
| 7 |
Log: |
| 8 |
Inside die(), only send the signal for subshell die support when we are |
| 9 |
actually in a subshell. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/isolated-functions.sh |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/isolated-functions.sh 2009-07-30 07:29:34 UTC (rev 13856) |
| 15 |
+++ main/trunk/bin/isolated-functions.sh 2009-07-30 07:31:06 UTC (rev 13857) |
| 16 |
@@ -150,7 +150,7 @@ |
| 17 |
[ -n "$EBUILD_EXIT_STATUS_FILE" ] && > "$EBUILD_EXIT_STATUS_FILE" |
| 18 |
|
| 19 |
# subshell die support |
| 20 |
- kill -s SIGTERM ${EBUILD_MASTER_PID} |
| 21 |
+ [[ $BASHPID = $EBUILD_MASTER_PID ]] || kill -s SIGTERM $EBUILD_MASTER_PID |
| 22 |
exit 1 |
| 23 |
} |
Archives