Attachment #82521 for bug #126756

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

Lines 408-415 Link Here

(-)bin/emerge (-1 / +7 lines)
408	myopts.remove("--tree")	408	myopts.remove("--tree")
409		409
410	# Set color output	410	# Set color output
411	if ("--nocolor" in myopts) and (sys.stdout.isatty()):	411	if "--nocolor" in myopts or \
		412	portage.settings["NOCOLOR"] in ("yes","true"):
412	nocolor()	413	nocolor()
		414	if "NOCOLOR" not in portage.settings:
		415	portage.settings.unlock()
		416	portage.settings["NOCOLOR"] = "true"
		417	portage.settings.backup_changes("NOCOLOR")
		418	portage.settings.lock()
413		419
414	if not ("--quiet" in myopts):	420	if not ("--quiet" in myopts):
415	if not sys.stdout.isatty() or ("--nospinner" in myopts):	421	if not sys.stdout.isatty() or ("--nospinner" in myopts):




[ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"

source /usr/lib/portage/bin/isolated-functions.sh  &>/dev/null
# TODO: make this conditional on config settings, fix any remaining stuff
set_colors

case "${NOCOLOR:-false}" in
	yes|true)
		unset_colors
		;;
	no|false)
		set_colors
		;;
esac


# the sandbox is disabled by default except when overridden in the relevant stages
export SANDBOX_ON="0"


Return to bug 126756

Lines 51-59 Link Here

(-)bin/ebuild.sh (-2 / +10 lines)
51	[ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"	51	[ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
52		52
53	source /usr/lib/portage/bin/isolated-functions.sh &>/dev/null	53	source /usr/lib/portage/bin/isolated-functions.sh &>/dev/null
54	# TODO: make this conditional on config settings, fix any remaining stuff
55	set_colors
56		54
		55	case "${NOCOLOR:-false}" in
		56	yes\|true)
		57	unset_colors
		58	;;
		59	no\|false)
		60	set_colors
		61	;;
		62	esac
		63
		64
57	# the sandbox is disabled by default except when overridden in the relevant stages	65	# the sandbox is disabled by default except when overridden in the relevant stages
58	export SANDBOX_ON="0"	66	export SANDBOX_ON="0"
59		67