Merge "misleading source filename in error message"

This commit is contained in:
Jenkins 2013-08-09 01:30:50 +00:00 committed by Gerrit Code Review
commit 334c3a71bd

View File

@ -127,7 +127,7 @@ function err() {
local exitcode=$? local exitcode=$?
errXTRACE=$(set +o | grep xtrace) errXTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
local msg="[ERROR] $0:$1 $2" local msg="[ERROR] ${BASH_SOURCE[2]}:$1 $2"
echo $msg 1>&2; echo $msg 1>&2;
if [[ -n ${SCREEN_LOGDIR} ]]; then if [[ -n ${SCREEN_LOGDIR} ]]; then
echo $msg >> "${SCREEN_LOGDIR}/error.log" echo $msg >> "${SCREEN_LOGDIR}/error.log"