From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 20 Jan 2008 19:01:26 +0000 (-0000)
Subject: Get rid of die alias to diefunc, since diefunc does nothing with the first three... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=74f09c650248d7265efaa90c68d2ab7d4edcc69b;p=portage.git

Get rid of die alias to diefunc, since diefunc does nothing with the first three arguments that the die alias inserts.  This commit /might/ be merged in the trunk.

svn path=/main/branches/prefix/; revision=9212
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 6deaaf695..8f8c9ddd0 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -5,8 +5,7 @@
 # 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 die='diefunc "$FUNCNAME" "$LINENO" "$?"'
-alias assert='_pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || diefunc "$FUNCNAME" "$LINENO" "$_pipestatus"'
+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'
 
@@ -48,9 +47,7 @@ dump_trace() {
 	done
 }
 
-diefunc() {
-	local funcname="$1" lineno="$2" exitcode="$3"
-	shift 3
+die() {
 	if [ -n "${QA_INTERCEPTORS}" ] ; then
 		# die was called from inside inherit. We need to clean up
 		# QA_INTERCEPTORS since sed is called below.