Attachment #84415 for bug #129244

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

Lines 11-16 Link Here

(-)bin/ebuild.sh (-2 / +2 lines)
11	SANDBOX_PREDICT="${SANDBOX_PREDICT}:${PORTAGE_GPG_DIR}"	11	SANDBOX_PREDICT="${SANDBOX_PREDICT}:${PORTAGE_GPG_DIR}"
12	fi	12	fi
13		13
		14	declare -rx EBUILD_PHASE
		15
14	if [ "$" != "depend" ] && [ "$" != "clean" ] && [ "$*" != "nofetch" ]; then	16	if [ "$" != "depend" ] && [ "$" != "clean" ] && [ "$*" != "nofetch" ]; then
15	if [ -f "${T}/environment" ]; then	17	if [ -f "${T}/environment" ]; then
16	source "${T}/environment" &>/dev/null	18	source "${T}/environment" &>/dev/null
Lines 20-27 Link Here
20	if [ -n "$#" ]; then	22	if [ -n "$#" ]; then
21	ARGS="${*}"	23	ARGS="${*}"
22	fi	24	fi
23
24	declare -rx EBUILD_PHASE="$*"
25		25
26	# Prevent aliases from causing portage to act inappropriately.	26	# Prevent aliases from causing portage to act inappropriately.
27	# Make sure it's before everything so we don't mess aliases that follow.	27	# Make sure it's before everything so we don't mess aliases that follow.

Lines 2197-2203 Link Here

(-)pym/portage.py (+2 lines)
2197	if retval:	2197	if retval:
2198	return retval	2198	return retval
2199	kwargs = actionmap[mydo]["args"]	2199	kwargs = actionmap[mydo]["args"]
		2200	mysettings["EBUILD_PHASE"] = mydo
2200	phase_retval = spawn(actionmap[mydo]["cmd"] % mydo, mysettings, debug=debug, logfile=logfile, **kwargs)	2201	phase_retval = spawn(actionmap[mydo]["cmd"] % mydo, mysettings, debug=debug, logfile=logfile, **kwargs)
		2202	del mysettings["EBUILD_PHASE"]
2201	if phase_retval == os.EX_OK:	2203	if phase_retval == os.EX_OK:
2202	if mydo == "install":	2204	if mydo == "install":
2203	mycommand = " ".join([MISC_SH_BINARY, "install_qa_check"])	2205	mycommand = " ".join([MISC_SH_BINARY, "install_qa_check"])

Return to bug 129244