diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-25 18:26:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-25 18:26:15 -0700 |
| commit | 07de48f66fc63bb747111af4ae6ad8fe53e9fe26 (patch) | |
| tree | 2264d62f0b3be033a14aff1b4b578fe53b6bc30d /bin/isolated-functions.sh | |
| parent | fb502ea2ad6bd0445b9e0266a862a106b35dbc34 (diff) | |
| download | portage-07de48f66fc63bb747111af4ae6ad8fe53e9fe26.tar.gz portage-07de48f66fc63bb747111af4ae6ad8fe53e9fe26.tar.bz2 portage-07de48f66fc63bb747111af4ae6ad8fe53e9fe26.zip | |
Use a PORTAGE_SIGPIPE_STATUS variable to export 128 + SIGPIPE to the
ebuild environment. SIGPIPE is typically 13, but its better not to
assume that.
Diffstat (limited to 'bin/isolated-functions.sh')
| -rw-r--r-- | bin/isolated-functions.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 8f0d20c9f..3df18b53c 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -34,7 +34,7 @@ assert_sigpipe_ok() { local x pipestatus=${PIPESTATUS[*]} for x in $pipestatus ; do # Allow SIGPIPE through (128 + 13) - [[ $x -ne 0 && $x -ne 141 ]] && die "$@" + [[ $x -ne 0 && $x -ne ${PORTAGE_SIGPIPE_STATUS:-141} ]] && die "$@" done # Require normal success for the last process (tar). @@ -602,7 +602,8 @@ save_ebuild_env() { PORTAGE_INST_UID PORTAGE_IPC_DAEMON \ PORTAGE_LOG_FILE PORTAGE_MASTER_PID \ PORTAGE_NONFATAL PORTAGE_QUIET PORTAGE_PYTHON \ - PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_UPDATE_ENV \ + PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_SIGPIPE_STATUS \ + PORTAGE_UPDATE_ENV \ PORTAGE_USERNAME PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \ PORTDIR_OVERLAY ${!PORTAGE_SANDBOX_*} PREROOTPATH \ PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \ |