diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2015-05-02 12:17:54 -0400 |
|---|---|---|
| committer |   William Hubbs <williamh@gentoo.org> | 2015-05-12 09:30:27 -0500 |
| commit | 5b7c6d26811fc04554a96368fcbfba534647d232 (patch) | |
| tree | c5d34c50cd602de75483911188036892e932c600 | |
| parent | start work on 0.10 (diff) | |
| download | gentoo-functions-5b7c6d26811fc04554a96368fcbfba534647d232.tar.gz gentoo-functions-5b7c6d26811fc04554a96368fcbfba534647d232.tar.bz2 gentoo-functions-5b7c6d26811fc04554a96368fcbfba534647d232.zip | |
Fix some logging issues
Fix ewarn and eerror so they always log to stderr.
Fix eerrorn so that it respects EINFO_QUIET instead of EERROR_QUIET.
This fixes #4.
X-Gentoo-Bug: 548158.
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=548158.
| -rw-r--r-- | functions.sh | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/functions.sh b/functions.sh index 8c32f2d..d99f03e 100644 --- a/functions.sh +++ b/functions.sh @@ -116,12 +116,12 @@ einfo() ewarnn() { if yesno "${EINFO_QUIET}"; then - printf " $*" - else + return 0 + else if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then - printf "\n" + printf "\n" >&2 fi - printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*" + printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*" >&2 fi local name="${0##*/}" @@ -138,12 +138,12 @@ ewarnn() ewarn() { if yesno "${EINFO_QUIET}"; then - printf " $*\n" - else + return 0 + else if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then - printf "\n" + printf "\n" >&2 fi - printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*\n" + printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*\n" >&2 fi local name="${0##*/}" @@ -159,13 +159,13 @@ ewarn() # eerrorn() { - if yesno "${EINFO_QUIET}"; then - printf " $*" >/dev/stderr + if yesno "${EERROR_QUIET}"; then + return 0 else if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then - printf "\n" + printf "\n" >&2 fi - printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*" + printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*" >&2 fi local name="${0##*/}" @@ -181,13 +181,13 @@ eerrorn() # eerror() { - if yesno "${EINFO_QUIET}"; then - printf " $*\n" >/dev/stderr + if yesno "${EERROR_QUIET}"; then + return 0 else if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then - printf "\n" + printf "\n" >&2 fi - printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*\n" + printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*\n" >&2 fi local name="${0##*/}" |