aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-14 20:11:57 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-14 20:11:57 -0700
commit00b66ec21bf0a4c148e31e90231695c220aa0a8a (patch)
tree257bd0fb4c3d2dcb134f0ac5c62ad3f075b64e26 /bin/isolated-functions.sh
parentportage.dep: Integrate the functionality of flatten into use_reduce (diff)
downloadportage-00b66ec21bf0a4c148e31e90231695c220aa0a8a.tar.gz
portage-00b66ec21bf0a4c148e31e90231695c220aa0a8a.tar.bz2
portage-00b66ec21bf0a4c148e31e90231695c220aa0a8a.zip
Disable EbuildIpcDaemon for now, since it seems to be triggering
intermittent build failures in my stage builds. For testing purposes set PORTAGE_IPC_DAEMON_ENABLE=1 to enable EbuildIpcDaemon.
Diffstat (limited to 'bin/isolated-functions.sh')
-rw-r--r--bin/isolated-functions.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index d484be1b6..53312dba8 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -192,6 +192,7 @@ die() {
fi
eerror "S: '${S}'"
+ [[ -n $PORTAGE_EBUILD_EXIT_FILE ]] && > "$PORTAGE_EBUILD_EXIT_FILE"
[[ -n $PORTAGE_IPC_DAEMON ]] && "$PORTAGE_BIN_PATH"/ebuild-ipc exit 1
# subshell die support
@@ -570,7 +571,7 @@ save_ebuild_env() {
PORTAGE_BASHRC PM_EBUILD_HOOK_DIR PORTAGE_BASHRCS_SOURCED \
PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
- PORTAGE_DEPCACHEDIR PORTAGE_GID \
+ PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE PORTAGE_GID \
PORTAGE_GRPNAME PORTAGE_INST_GID \
PORTAGE_INST_UID PORTAGE_IPC_DAEMON \
PORTAGE_LOG_FILE PORTAGE_MASTER_PID \