diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-06-22 17:16:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-22 17:16:46 +0000 |
| commit | 43210ad0726bf87ca10ce050eb2ceac5edb6bfc1 (patch) | |
| tree | d043f16d7681e373b445e56818a1ead69b13fc95 /bin/isolated-functions.sh | |
| parent | Don't register signal handlers during module import because it may override s... (diff) | |
| download | portage-multirepo-43210ad0726bf87ca10ce050eb2ceac5edb6bfc1.tar.gz portage-multirepo-43210ad0726bf87ca10ce050eb2ceac5edb6bfc1.tar.bz2 portage-multirepo-43210ad0726bf87ca10ce050eb2ceac5edb6bfc1.zip | |
As suggested by exg, include the einfon code inside einfo instead of using the FUNCNAME hack (FUNCNAME only works with >=bash-3.0).
svn path=/main/trunk/; revision=3607
Diffstat (limited to 'bin/isolated-functions.sh')
| -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 0bb4fa6d..94ff1c98 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 } |