Format the callstack indentation more like it used to be.

svn path=/main/trunk/; revision=7050

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 161937734821da02d6b1cdae657aeb4a4e5c6275..f95b207fda0108fadb1b5b751ff3f02b01f6844f 100755 (executable)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -37,7 +37,7 @@ dump_trace() {
                         done
                         (( p -= ${BASH_ARGC[${n} - 1]} ))
                 fi
-                eerror "${sourcefile}, line ${lineno}: Called ${funcname}${args:+ ${args}}"
+                eerror "  ${sourcefile}, line ${lineno}:   Called ${funcname}${args:+ ${args}}"
         done
 }
 
@@ -47,7 +47,7 @@ diefunc() {
         eerror
         eerror "ERROR: $CATEGORY/$PF failed."
         dump_trace 2
-        eerror "$(basename "${BASH_SOURCE[1]}"), line ${BASH_LINENO[0]}:   Called die"
+        eerror "  ${BASH_SOURCE[1]##*/}, line ${BASH_LINENO[0]}:   Called die"
         eerror
         eerror "${*:-(no error message)}"
         eerror "If you need support, post the topmost build error, and the call stack if relevant."