Attachment #228929 for bug #44796




	# We assume if people are changing shopts in their bashrc they do so at their
	# own peril.  This is the ONLY non-portage bit of code that can change shopts
	# without a QA violation.
	for x in "${PORTAGE_BASHRC}" "${PORTAGE_BASHENVDIR}"/${CATEGORY}/{${PN},${P},${PF}}; do
		if [ -r "${x}" ]; then
			# If $- contains x, then tracing has already enabled elsewhere for some
			# reason.  We preserve it's state so as not to interfere.
			if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then
				source "${x}"
			else
				set -x
				source "${x}"
				set +x
			fi
		fi
	done

	[ ! -z "${OCC}" ] && export CC="${OCC}"
	[ ! -z "${OCXX}" ] && export CXX="${OCXX}"
}

Lines 553-559 save_ebuild_env() { Link Here

(-)a/bin/isolated-functions.sh (-1 / +1 lines)
553	LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \	553	LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
554	NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \	554	NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
555	PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \	555	PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \
556	PORTAGE_BASHRC PORTAGE_BASHRCS_SOURCED \	556	PORTAGE_BASHRC PORTAGE_BASHENVDIR PORTAGE_BASHRCS_SOURCED \
557	PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \	557	PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
558	PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \	558	PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
559	PORTAGE_DEPCACHEDIR PORTAGE_GID \	559	PORTAGE_DEPCACHEDIR PORTAGE_GID \

Lines 34-39 MODULES_FILE_PATH = USER_CONFIG_PATH + "/modules" Link Here

(-)a/pym/portage/const.py (+1 lines)
34	CUSTOM_PROFILE_PATH = USER_CONFIG_PATH + "/profile"	34	CUSTOM_PROFILE_PATH = USER_CONFIG_PATH + "/profile"
35	USER_VIRTUALS_FILE = USER_CONFIG_PATH + "/virtuals"	35	USER_VIRTUALS_FILE = USER_CONFIG_PATH + "/virtuals"
36	EBUILD_SH_ENV_FILE = USER_CONFIG_PATH + "/bashrc"	36	EBUILD_SH_ENV_FILE = USER_CONFIG_PATH + "/bashrc"
		37	EBUILD_SH_ENV_DIR = USER_CONFIG_PATH + "/env"
37	CUSTOM_MIRRORS_FILE = USER_CONFIG_PATH + "/mirrors"	38	CUSTOM_MIRRORS_FILE = USER_CONFIG_PATH + "/mirrors"
38	COLOR_MAP_FILE = USER_CONFIG_PATH + "/color.map"	39	COLOR_MAP_FILE = USER_CONFIG_PATH + "/color.map"
39	PROFILE_PATH = "etc/make.profile"	40	PROFILE_PATH = "etc/make.profile"

Lines 172-178 class config(object): Link Here

(-)a/pym/portage/package/ebuild/config.py (-1 / +1 lines)
172	"PKGDIR",	172	"PKGDIR",
173	"PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",	173	"PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",
174	"PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST",	174	"PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST",
175	"PORTAGE_BASHRC",	175	"PORTAGE_BASHRC", "PORTAGE_BASHENVDIR",
176	"PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TAR_OPTS",	176	"PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TAR_OPTS",
177	"PORTAGE_BINPKG_TMPFILE",	177	"PORTAGE_BINPKG_TMPFILE",
178	"PORTAGE_BIN_PATH",	178	"PORTAGE_BIN_PATH",

Return to bug 44796

Lines 1557-1573 source_all_bashrcs() { Link Here

(-)a/bin/ebuild.sh (-10 / +13 lines)
1557	# We assume if people are changing shopts in their bashrc they do so at their	1557	# We assume if people are changing shopts in their bashrc they do so at their
1558	# own peril. This is the ONLY non-portage bit of code that can change shopts	1558	# own peril. This is the ONLY non-portage bit of code that can change shopts
1559	# without a QA violation.	1559	# without a QA violation.
1560	if [ -f "${PORTAGE_BASHRC}" ]; then	1560	for x in "${PORTAGE_BASHRC}" "${PORTAGE_BASHENVDIR}"/${CATEGORY}/{${PN},${P},${PF}}; do
1561	# If $- contains x, then tracing has already enabled elsewhere for some	1561	if [ -r "${x}" ]; then
1562	# reason. We preserve it's state so as not to interfere.	1562	# If $- contains x, then tracing has already enabled elsewhere for some
1563	if [ "$PORTAGE_DEBUG" != "1" ] \|\| [ "${-/x/}" != "$-" ]; then	1563	# reason. We preserve it's state so as not to interfere.
1564	source "${PORTAGE_BASHRC}"	1564	if [ "$PORTAGE_DEBUG" != "1" ] \|\| [ "${-/x/}" != "$-" ]; then
1565	else	1565	source "${x}"
1566	set -x	1566	else
1567	source "${PORTAGE_BASHRC}"	1567	set -x
1568	set +x	1568	source "${x}"
		1569	set +x
		1570	fi
1569	fi	1571	fi
1570	fi	1572	done
		1573
1571	[ ! -z "${OCC}" ] && export CC="${OCC}"	1574	[ ! -z "${OCC}" ] && export CC="${OCC}"
1572	[ ! -z "${OCXX}" ] && export CXX="${OCXX}"	1575	[ ! -z "${OCXX}" ] && export CXX="${OCXX}"
1573	}	1576	}

Lines 32-39 from portage import auxdbkeys, bsd_chflags, dep_check, \ Link Here

(-)a/pym/portage/package/ebuild/doebuild.py (-3 / +4 lines)
32	eapi_is_supported, merge, os, selinux, StringIO, \	32	eapi_is_supported, merge, os, selinux, StringIO, \
33	unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \	33	unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \
34	_shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode	34	_shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode
35	from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_BINARY, \	35	from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \
36	INVALID_ENV_FILE, MISC_SH_BINARY	36	EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY
37	from portage.data import portage_gid, portage_uid, secpass, \	37	from portage.data import portage_gid, portage_uid, secpass, \
38	uid, userpriv_groups	38	uid, userpriv_groups
39	from portage.dbapi.virtual import fakedbapi	39	from portage.dbapi.virtual import fakedbapi
Lines 211-216 def doebuild_environment(myebuild, mydo, myroot, mysettings, Link Here
211		211
212	mysettings["PORTAGE_BASHRC"] = os.path.join(	212	mysettings["PORTAGE_BASHRC"] = os.path.join(
213	mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_FILE)	213	mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_FILE)
		214	mysettings["PORTAGE_BASHENVDIR"] = os.path.join(
		215	mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_DIR)
214	mysettings["EBUILD_EXIT_STATUS_FILE"] = os.path.join(	216	mysettings["EBUILD_EXIT_STATUS_FILE"] = os.path.join(
215	mysettings["PORTAGE_BUILDDIR"], ".exit_status")	217	mysettings["PORTAGE_BUILDDIR"], ".exit_status")
216		218
217	-