summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-12-19 04:18:38 +0000
committerZac Medico <zmedico@gentoo.org>2009-12-19 04:18:38 +0000
commitc86c1391904231287824676cc663d7e3eddd8954 (patch)
tree5cb5d1eb9c76160c1bcc762693df36cca6ce8430
parentbe3b371eb3ece4bb0582d960778dc351f87e775d (diff)
downloadportage-c86c1391904231287824676cc663d7e3eddd8954.tar.gz
portage-c86c1391904231287824676cc663d7e3eddd8954.tar.bz2
portage-c86c1391904231287824676cc663d7e3eddd8954.zip
Fix the assert alias to avoid 'value to great for base' messages in some cases.
Thanks to Jonathan Callen <abcd@g.o> for reporting. svn path=/main/trunk/; revision=15121
-rwxr-xr-xbin/isolated-functions.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 893ce57ba..bf0bb16b8 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -5,10 +5,16 @@
# We need this next line for "die" and "assert". It expands
# It _must_ preceed all the calls to die and assert.
shopt -s expand_aliases
-alias assert='_pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || die'
alias save_IFS='[ "${IFS:-unset}" != "unset" ] && old_IFS="${IFS}"'
alias restore_IFS='if [ "${old_IFS:-unset}" != "unset" ]; then IFS="${old_IFS}"; unset old_IFS; else unset IFS; fi'
+assert() {
+ local x pipestatus=${PIPESTATUS[*]}
+ for x in $pipestatus ; do
+ [[ $x -eq 0 ]] || die "$@"
+ done
+}
+
shopt -s extdebug
# dump_trace([number of funcs on stack to skip],
@@ -519,7 +525,8 @@ save_ebuild_env() {
done
unset x
- unset -f dump_trace die diefunc quiet_mode vecho elog_base eqawarn elog \
+ unset -f assert dump_trace die diefunc \
+ quiet_mode vecho elog_base eqawarn elog \
esyslog einfo einfon ewarn eerror ebegin _eend eend KV_major \
KV_minor KV_micro KV_to_int get_KV unset_colors set_colors has \
has_phase_defined_up_to \