aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-11-30 13:12:58 +0100
committerMichał Górny <mgorny@gentoo.org>2014-12-04 15:01:34 +0100
commit525e69351d45621c34a9326fcbc11ca592cb6539 (patch)
tree3a427838eec1c017113b9a34a851d9f2af870702 /bin/isolated-functions.sh
parentrepoman: Add check for missing slot values/slot operators (diff)
downloadportage-525e69351d45621c34a9326fcbc11ca592cb6539.tar.gz
portage-525e69351d45621c34a9326fcbc11ca592cb6539.tar.bz2
portage-525e69351d45621c34a9326fcbc11ca592cb6539.zip
Respect nonfatal in unpack(), econf() and einstall()
Diffstat (limited to 'bin/isolated-functions.sh')
-rw-r--r--bin/isolated-functions.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 42bf05d0f..ed96bd061 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -36,11 +36,18 @@ __assert_sigpipe_ok() {
local x pipestatus=${PIPESTATUS[*]}
for x in $pipestatus ; do
# Allow SIGPIPE through (128 + 13)
- [[ $x -ne 0 && $x -ne ${PORTAGE_SIGPIPE_STATUS:-141} ]] && die "$@"
+ if [[ $x -ne 0 && $x -ne ${PORTAGE_SIGPIPE_STATUS:-141} ]]
+ then
+ __helpers_die "$@"
+ return 1
+ fi
done
# Require normal success for the last process (tar).
- [[ $x -eq 0 ]] || die "$@"
+ if [[ $x -ne 0 ]]; then
+ __helpers_die "$@"
+ return 1
+ fi
}
shopt -s extdebug