diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-31 16:14:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-31 16:14:10 +0000 |
| commit | af166550fdc92c596d0345ff62f2cb3605a045c6 (patch) | |
| tree | 1743f0cfc9bc76e37cde8d2b6c89e2e64e0f4daa | |
| parent | 2d4aa6f38da7ecfabb6d37e3d8bf01b860d5b76d (diff) | |
| download | portage-af166550fdc92c596d0345ff62f2cb3605a045c6.tar.gz portage-af166550fdc92c596d0345ff62f2cb3605a045c6.tar.bz2 portage-af166550fdc92c596d0345ff62f2cb3605a045c6.zip | |
As suggested by exg, include the einfon code inside einfo instead of using the FUNCNAME hack (FUNCNAME only works with >=bash-3.0). See bug #136208. This patch is from trunk r3607.
svn path=/main/branches/2.1/; revision=4062
| -rw-r--r-- | bin/isolated-functions.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 0bb4fa6d5..94ff1c983 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -49,7 +49,9 @@ esyslog() { } einfo() { - einfon "$*" + elog_base INFO "$*" + [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo + echo -e " ${GOOD}*${NORMAL} $*" LAST_E_CMD="einfo" return 0 } @@ -57,11 +59,7 @@ einfo() { einfon() { elog_base INFO "$*" [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo - if [ "${FUNCNAME[1]}" == "einfo" ]; then - echo -e " ${GOOD}*${NORMAL} $*" - else - echo -ne " ${GOOD}*${NORMAL} $*" - fi + echo -ne " ${GOOD}*${NORMAL} $*" LAST_E_CMD="einfon" return 0 } |