diff options
| -rwxr-xr-x | bin/ebuild.sh | 7 | ||||
| -rwxr-xr-x | bin/setsid | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 794738f16..6843331ed 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -26,11 +26,14 @@ PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sb export PATH if [[ -z $PORTAGE_SETSID && -n $1 && $1 != depend ]] ; then + # If available, use setsid to create a new login session so that we can use + # SIGHUP to ensure that no orphaned subprocesses are left running. if type -P setsid >/dev/null ; then - # Use setsid to create a new login session so that we can use SIGHUP - # to ensure that no orphaned subprocesses are left running. export PORTAGE_SETSID=1 exec setsid "$PORTAGE_BIN_PATH/ebuild.sh" "$@" + elif [[ -x $PORTAGE_BIN_PATH/setsid ]] ; then + export PORTAGE_SETSID=1 + exec "$PORTAGE_BIN_PATH/setsid" "$PORTAGE_BIN_PATH/ebuild.sh" "$@" fi fi [[ $PORTAGE_SETSID = 1 ]] && trap 'trap : SIGHUP ; kill -s SIGHUP 0 ;' EXIT diff --git a/bin/setsid b/bin/setsid new file mode 100755 index 000000000..1be1e55c2 --- /dev/null +++ b/bin/setsid @@ -0,0 +1,10 @@ +#!/usr/bin/python -O +# Copyright 2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +import os +import sys + +os.setsid() +os.execl(sys.argv[1], *sys.argv[1:]) |