diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-08-13 07:05:12 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-13 07:05:12 -0700 |
| commit | 12cbc8821476dcbac38464a41f7cb336da7ac0c9 (patch) | |
| tree | c985564961b89af1f3ccb72f4347e41e0dd91a90 /bin/isolated-functions.sh | |
| parent | Use SpawnProcess instead of doebuild.spawn(). (diff) | |
| download | portage-12cbc8821476dcbac38464a41f7cb336da7ac0c9.tar.gz portage-12cbc8821476dcbac38464a41f7cb336da7ac0c9.tar.bz2 portage-12cbc8821476dcbac38464a41f7cb336da7ac0c9.zip | |
Use EbuildIpcDaemon to replace the functionality of
EBUILD_EXIT_STATUS_FILE.
Diffstat (limited to 'bin/isolated-functions.sh')
| -rw-r--r-- | bin/isolated-functions.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index ddcf8f0d7..14ba58cc8 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -189,7 +189,7 @@ die() { fi eerror "S: '${S}'" - [ -n "$EBUILD_EXIT_STATUS_FILE" ] && > "$EBUILD_EXIT_STATUS_FILE" + [[ -n $PORTAGE_IPC_DAEMON ]] && "$PORTAGE_BIN_PATH"/ebuild-ipc exit 1 # subshell die support [[ $BASHPID = $EBUILD_MASTER_PID ]] || kill -s SIGTERM $EBUILD_MASTER_PID @@ -558,7 +558,7 @@ save_ebuild_env() { # portage config variables and variables set directly by portage unset ACCEPT_LICENSE BAD BRACKET BUILD_PREFIX COLS \ DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR \ - EBUILD_EXIT_STATUS_FILE EBUILD_FORCE_TEST EBUILD_MASTER_PID \ + EBUILD_FORCE_TEST EBUILD_MASTER_PID \ ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \ GOOD HILITE HOME \ LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \ @@ -569,7 +569,8 @@ save_ebuild_env() { PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \ PORTAGE_DEPCACHEDIR PORTAGE_GID \ PORTAGE_GRPNAME PORTAGE_INST_GID \ - PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \ + PORTAGE_INST_UID PORTAGE_IPC_DAEMON \ + PORTAGE_LOG_FILE PORTAGE_MASTER_PID \ PORTAGE_NONFATAL PORTAGE_QUIET \ PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_UPDATE_ENV \ PORTAGE_USERNAME PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \ |