Attachment #142944 for bug #155993

Lines 1021-1027 Link Here

(-)pym/portage.py (-1 / +5 lines)
1021	"PORTAGE_IUSE",	1021	"PORTAGE_IUSE",
1022	"PORTAGE_LOG_FILE", "PORTAGE_MASTER_PID",	1022	"PORTAGE_LOG_FILE", "PORTAGE_MASTER_PID",
1023	"PORTAGE_PYM_PATH", "PORTAGE_REPO_NAME", "PORTAGE_RESTRICT",	1023	"PORTAGE_PYM_PATH", "PORTAGE_REPO_NAME", "PORTAGE_RESTRICT",
1024	"PORTAGE_TMPDIR", "PORTAGE_WORKDIR_MODE",	1024	"PORTAGE_TMPDIR", "PORTAGE_UPDATE_ENV", "PORTAGE_WORKDIR_MODE",
1025	"PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH", "PROFILE_PATHS",	1025	"PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH", "PROFILE_PATHS",
1026	"ROOT", "ROOTPATH", "STARTDIR", "T", "TMP", "TMPDIR",	1026	"ROOT", "ROOTPATH", "STARTDIR", "T", "TMP", "TMPDIR",
1027	"USE_EXPAND", "USE_ORDER", "WORKDIR",	1027	"USE_EXPAND", "USE_ORDER", "WORKDIR",
Lines 9133-9140 Link Here
9133	del conf_mem_file	9133	del conf_mem_file
9134		9134
9135	#do postinst script	9135	#do postinst script
		9136	self.settings["PORTAGE_UPDATE_ENV"] = \
		9137	os.path.join(self.dbpkgdir, "environment.bz2")
		9138	self.settings.backup_changes("PORTAGE_UPDATE_ENV")
9136	a = doebuild(myebuild, "postinst", destroot, self.settings, use_cache=0,	9139	a = doebuild(myebuild, "postinst", destroot, self.settings, use_cache=0,
9137	tree=self.treetype, mydbapi=mydbapi, vartree=self.vartree)	9140	tree=self.treetype, mydbapi=mydbapi, vartree=self.vartree)
		9141	self.settings.pop("PORTAGE_UPDATE_ENV", None)
9138		9142
9139	# XXX: Decide how to handle failures here.	9143	# XXX: Decide how to handle failures here.
9140	if a != os.EX_OK:	9144	if a != os.EX_OK:

Lines 470-476 Link Here

(-)bin/isolated-functions.sh (-1 / +2 lines)
470	PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \	470	PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
471	PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \	471	PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \
472	PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \	472	PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
473	PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_WORKDIR_MODE PORTDIR \	473	PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_UPDATE_ENV \
		474	PORTAGE_WORKDIR_MODE PORTDIR \
474	PORTDIR_OVERLAY ${!PORTAGE_SANDBOX_*} PREROOTPATH \	475	PORTDIR_OVERLAY ${!PORTAGE_SANDBOX_*} PREROOTPATH \
475	PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \	476	PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \
476	RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL \	477	RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL \




			ebuild_phase_with_hooks pkg_${EBUILD_SH_ARGS}
			set +x
		fi
		if [[ $EBUILD_PHASE == postinst ]] && [[ -n $PORTAGE_UPDATE_ENV ]]; then
			# Update environment.bz2 in case installation phases
			# need to pass some variables to uninstallation phases.
			(
				unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_
				save_ebuild_env | filter_readonly_variables \
					--filter-sandbox --allow-extra-vars | \
					bzip2 -c -f9 > "$PORTAGE_UPDATE_ENV"
			)
		fi
		;;
	unpack|compile|test|clean|install)
		if [ "${SANDBOX_DISABLED="0"}" == "0" ]; then

Return to bug 155993

Lines 1777-1782 Link Here

(-)bin/ebuild.sh (+10 lines)
1777	ebuild_phase_with_hooks pkg_${EBUILD_SH_ARGS}	1777	ebuild_phase_with_hooks pkg_${EBUILD_SH_ARGS}
1778	set +x	1778	set +x
1779	fi	1779	fi
		1780	if [[ $EBUILD_PHASE == postinst ]] && [[ -n $PORTAGE_UPDATE_ENV ]]; then
		1781	# Update environment.bz2 in case installation phases
		1782	# need to pass some variables to uninstallation phases.
		1783	(
		1784	unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_
		1785	save_ebuild_env \| filter_readonly_variables \
		1786	--filter-sandbox --allow-extra-vars \| \
		1787	bzip2 -c -f9 > "$PORTAGE_UPDATE_ENV"
		1788	)
		1789	fi
1780	;;	1790	;;
1781	unpack\|compile\|test\|clean\|install)	1791	unpack\|compile\|test\|clean\|install)
1782	if [ "${SANDBOX_DISABLED="0"}" == "0" ]; then	1792	if [ "${SANDBOX_DISABLED="0"}" == "0" ]; then