Attachment #199617 for bug #278895

View | Details | Raw Unified | Return to bug 278895
Collapse All | Expand All

Lines 1048-1053 Link Here

(-)pym/portage/__init__.py (+1 lines)
1048	"EBUILD_PHASE", "EMERGE_FROM", "HOMEPAGE", "INHERITED", "IUSE",	1048	"EBUILD_PHASE", "EMERGE_FROM", "HOMEPAGE", "INHERITED", "IUSE",
1049	"KEYWORDS", "LICENSE", "PDEPEND", "PF", "PKGUSE",	1049	"KEYWORDS", "LICENSE", "PDEPEND", "PF", "PKGUSE",
1050	"PORTAGE_CONFIGROOT", "PORTAGE_IUSE", "PORTAGE_REPO_NAME",	1050	"PORTAGE_CONFIGROOT", "PORTAGE_IUSE", "PORTAGE_REPO_NAME",
		1051	"PORTAGE_SETSID",
1051	"PORTAGE_USE", "PROPERTIES", "PROVIDE", "RDEPEND", "RESTRICT",	1052	"PORTAGE_USE", "PROPERTIES", "PROVIDE", "RDEPEND", "RESTRICT",
1052	"ROOT", "SLOT", "SRC_URI"	1053	"ROOT", "SLOT", "SRC_URI"
1053	]	1054	]

Lines 536-542 Link Here

(-)bin/isolated-functions.sh (-1 / +2 lines)
536	PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \	536	PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \
537	PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \	537	PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
538	PORTAGE_QUIET \	538	PORTAGE_QUIET \
539	PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_UPDATE_ENV \	539	PORTAGE_REPO_NAME PORTAGE_RESTRICT \
		540	PORTAGE_SETSID PORTAGE_UPDATE_ENV \
540	PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \	541	PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \
541	PORTDIR_OVERLAY ${!PORTAGE_SANDBOX_*} PREROOTPATH \	542	PORTDIR_OVERLAY ${!PORTAGE_SANDBOX_*} PREROOTPATH \
542	PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \	543	PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \




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 $EBUILD_SH_ARGS && $EBUILD_SH_ARGS != depend ]] ; then
	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" $EBUILD_SH_ARGS
	fi
fi
trap '[[ $PORTAGE_SETSID = 1 ]] && { trap : SIGHUP ; kill -s SIGHUP 0 ; }' EXIT

source "${PORTAGE_BIN_PATH}/isolated-functions.sh"  &>/dev/null

# Set IMAGE for minimal backward compatibility with

Return to bug 278895

Lines 71-76 Link Here

(-)bin/ebuild.sh (+11 lines)
71	PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin${ROOTPATH:+:}$ROOTPATH	71	PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin${ROOTPATH:+:}$ROOTPATH
72	export PATH	72	export PATH
73		73
		74	if [[ -z $PORTAGE_SETSID && \
		75	-n $EBUILD_SH_ARGS && $EBUILD_SH_ARGS != depend ]] ; then
		76	if type -P setsid >/dev/null ; then
		77	# Use setsid to create a new login session so that we can use SIGHUP
		78	# to ensure that no orphaned subprocesses are left running.
		79	export PORTAGE_SETSID=1
		80	exec setsid "$PORTAGE_BIN_PATH/ebuild.sh" $EBUILD_SH_ARGS
		81	fi
		82	fi
		83	trap '[[ $PORTAGE_SETSID = 1 ]] && { trap : SIGHUP ; kill -s SIGHUP 0 ; }' EXIT
		84
74	source "${PORTAGE_BIN_PATH}/isolated-functions.sh" &>/dev/null	85	source "${PORTAGE_BIN_PATH}/isolated-functions.sh" &>/dev/null
75		86
76	# Set IMAGE for minimal backward compatibility with	87	# Set IMAGE for minimal backward compatibility with