[gentoo-commits] portage r13879 - in main/trunk: bin pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-08-03 20:13:17 +0000 (Mon, 03 Aug 2009)
New Revision: 13879

Removed:
   main/trunk/bin/setsid
Modified:
   main/trunk/bin/ebuild.sh
   main/trunk/bin/isolated-functions.sh
   main/trunk/pym/portage/__init__.py
Log:
Remove the code from bug #278895 since we're going to need a daemon process
in the ebuild's login session in order to pass signals from the controlling
terminal to the detached session. A simple fifo-based approach in ebuild.sh
does not seem to work since bash's read builtin occasionally loses the fifo
data when it's 'Interrupted system call'. Maybe a python script will work
better for the session leader/daemon. NOTE: The daemon will also be useful
for implementing a fifo-based die helper (to replace the current signal-
based approach).


Modified: main/trunk/bin/ebuild.sh
===================================================================
--- main/trunk/bin/ebuild.sh	2009-08-03 17:48:09 UTC (rev 13878)
+++ main/trunk/bin/ebuild.sh	2009-08-03 20:13:17 UTC (rev 13879)
@@ -25,19 +25,6 @@
 PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin${ROOTPATH:+:}$ROOTPATH
 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
-		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
-
 # These two functions wrap sourcing and calling respectively.  At present they
 # perform a qa check to make sure eclasses and ebuilds and profiles don't mess
 # with shell opts (shopts).  Ebuilds/eclasses changing shopts should reset them 

Modified: main/trunk/bin/isolated-functions.sh
===================================================================
--- main/trunk/bin/isolated-functions.sh	2009-08-03 17:48:09 UTC (rev 13878)
+++ main/trunk/bin/isolated-functions.sh	2009-08-03 20:13:17 UTC (rev 13879)
@@ -536,8 +536,7 @@
 			PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \
 			PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
 			PORTAGE_QUIET \
-			PORTAGE_REPO_NAME PORTAGE_RESTRICT \
-			PORTAGE_SETSID PORTAGE_UPDATE_ENV \
+			PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_UPDATE_ENV \
 			PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \
 			PORTDIR_OVERLAY ${!PORTAGE_SANDBOX_*} PREROOTPATH \
 			PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \

Deleted: main/trunk/bin/setsid
===================================================================
--- main/trunk/bin/setsid	2009-08-03 17:48:09 UTC (rev 13878)
+++ main/trunk/bin/setsid	2009-08-03 20:13:17 UTC (rev 13879)
@@ -1,10 +0,0 @@
-#!/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:])

Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2009-08-03 17:48:09 UTC (rev 13878)
+++ main/trunk/pym/portage/__init__.py	2009-08-03 20:13:17 UTC (rev 13879)
@@ -1048,7 +1048,6 @@
 		"EBUILD_PHASE", "EMERGE_FROM", "HOMEPAGE", "INHERITED", "IUSE",
 		"KEYWORDS", "LICENSE", "PDEPEND", "PF", "PKGUSE",
 		"PORTAGE_CONFIGROOT", "PORTAGE_IUSE", "PORTAGE_REPO_NAME",
-		"PORTAGE_SETSID",
 		"PORTAGE_USE", "PROPERTIES", "PROVIDE", "RDEPEND", "RESTRICT",
 		"ROOT", "SLOT", "SRC_URI"
 	]