Attachment #85031 for bug #127585

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

Lines 5-10 Link Here

(-)bin/isolated-functions.sh (-1 / +4 lines)
5	# Internal logging function, don't use this in ebuilds	5	# Internal logging function, don't use this in ebuilds
6	elog_base() {	6	elog_base() {
7	local messagetype	7	local messagetype
		8	local phase
		9	phase="${EBUILD_PHASE}"
		10	[ -z "${EBUILD_PHASE}" ] && phase="other"
8	[ -z "${1}" -o -z "${T}" -o ! -d "${T}/logging" ] && return 1	11	[ -z "${1}" -o -z "${T}" -o ! -d "${T}/logging" ] && return 1
9	case "${1}" in	12	case "${1}" in
10	INFO\|WARN\|ERROR\|LOG)	13	INFO\|WARN\|ERROR\|LOG)
Lines 16-22 Link Here
16	return 1	19	return 1
17	;;	20	;;
18	esac	21	esac
19	echo "$*" >> ${T}/logging/${EBUILD_PHASE}.${messagetype}	22	echo "$*" >> ${T}/logging/${phase}.${messagetype}
20	return 0	23	return 0
21	}	24	}
22		25

Lines 42-48 Link Here

(-)pym/portage_const.py (-1 / +1 lines)
42		42
43	INCREMENTALS=["USE","USE_EXPAND","USE_EXPAND_HIDDEN","FEATURES","ACCEPT_KEYWORDS","ACCEPT_LICENSE","CONFIG_PROTECT_MASK","CONFIG_PROTECT","PRELINK_PATH","PRELINK_PATH_MASK"]	43	INCREMENTALS=["USE","USE_EXPAND","USE_EXPAND_HIDDEN","FEATURES","ACCEPT_KEYWORDS","ACCEPT_LICENSE","CONFIG_PROTECT_MASK","CONFIG_PROTECT","PRELINK_PATH","PRELINK_PATH_MASK"]
44	STICKIES=["KEYWORDS_ACCEPT","USE","CFLAGS","CXXFLAGS","MAKEOPTS","EXTRA_ECONF","EXTRA_EINSTALL","EXTRA_EMAKE"]	44	STICKIES=["KEYWORDS_ACCEPT","USE","CFLAGS","CXXFLAGS","MAKEOPTS","EXTRA_ECONF","EXTRA_EINSTALL","EXTRA_EMAKE"]
45	EBUILD_PHASES = ["setup","unpack","compile","test","install","preinst","postinst","prerm","postrm"]	45	EBUILD_PHASES = ["setup","unpack","compile","test","install","preinst","postinst","prerm","postrm", "other"]
46		46
47	EAPI = 0	47	EAPI = 0
48		48

Return to bug 127585