diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-01-10 04:22:27 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-01-10 04:22:27 +0000 |
commit | c53f52941c88b24c20204f1795dc02f595ee3a57 (patch) | |
tree | ea728689d7e18677337067eeb062f09294070af4 /bin/ebuild.sh | |
parent | 62b9787719172d3b628eaecf6cf7b3f21645c8d5 (diff) | |
download | portage-c53f52941c88b24c20204f1795dc02f595ee3a57.tar.gz portage-c53f52941c88b24c20204f1795dc02f595ee3a57.tar.bz2 portage-c53f52941c88b24c20204f1795dc02f595ee3a57.zip |
For bug #160075, send all 'QA Notice' messages to eqawarn. Also, modify eqawarn to use vecho and send ouput to stderr.
svn path=/main/trunk/; revision=5507
Diffstat (limited to 'bin/ebuild.sh')
-rwxr-xr-x | bin/ebuild.sh | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index dde131b38..7dc3cc95e 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -27,9 +27,9 @@ qa_source() { local shopts=$(shopt) OLDIFS="$IFS" source "$@" || return 1 [[ $shopts != $(shopt) ]] && - vecho "QA Notice: Global shell options were changed and not restored while sourcing $1" + eqawarn "QA Notice: Global shell options changed and were not restored while sourcing '$*'" [[ "$IFS" != "$OLDIFS" ]] && - vecho "QA Notice: IFS was changed and not reset while sourcing $1" + eqawarn "QA Notice: Global IFS changed and was not restored while sourcing '$*'" return 0 } @@ -37,9 +37,9 @@ qa_call() { local shopts=$(shopt) OLDIFS="$IFS" "$@" || return 1 [[ $shopts != $(shopt) ]] && - vecho "QA Notice: Global shell options were changed while calling $1" + eqawarn "QA Notice: Global shell options changed and were not restored while calling '$*'" [[ "$IFS" != "$OLDIFS" ]] && - vecho "QA Notice: IFS was changed and not reset while calling $1" + eqawarn "QA Notice: Global IFS changed and was not restored while calling '$*'" return 0 } @@ -80,15 +80,6 @@ export PATH="/usr/local/sbin:/sbin:/usr/sbin:${PORTAGE_BIN_PATH}:/usr/local/bin: source "${PORTAGE_BIN_PATH}/isolated-functions.sh" &>/dev/null -case "${NOCOLOR:-false}" in - yes|true) - unset_colors - ;; - no|false) - set_colors - ;; -esac - [[ $PORTAGE_QUIET != "" ]] && export PORTAGE_QUIET # the sandbox is disabled by default except when overridden in the relevant stages @@ -179,7 +170,7 @@ useq() { # Make sure we have this USE flag in IUSE if ! hasq "${u}" ${IUSE} ${E_IUSE} && ! hasq "${u}" ${PORTAGE_ARCHLIST} selinux; then - vecho "QA Notice: USE Flag '${u}' not in IUSE for ${CATEGORY}/${PF}" >&2 + eqawarn "QA Notice: USE Flag '${u}' not in IUSE for ${CATEGORY}/${PF}" fi if hasq ${u} ${USE} ; then @@ -1219,9 +1210,7 @@ inherit() { # false alarms due to INHERITED in /var/db/pkg being outdated # in comparison the the eclasses from the portage tree. if ! hasq $ECLASS $INHERITED; then - vecho - vecho "QA Notice: ECLASS '$ECLASS' inherited illegally in $CATEGORY/$PF" >&2 - vecho + eqawarn "QA Notice: ECLASS '$ECLASS' inherited illegally in $CATEGORY/$PF" fi fi @@ -1494,11 +1483,10 @@ if hasq "depend" "${EBUILD_SH_ARGS}"; then BODY="${BIN_PATH} \"\$@\"; return \$?" fi FUNC_SRC="${BIN}() { - vecho -n \"QA Notice: ${BIN} in global scope: \" >&2 if [ \$ECLASS_DEPTH -gt 0 ]; then - vecho \"eclass \${ECLASS}\" >&2 + eqawarn \"QA Notice: '${BIN}' called in global scope: eclass \${ECLASS}\" else - vecho \"\${CATEGORY}/\${PF}\" >&2 + eqawarn \"QA Notice: '${BIN}' called in global scope: \${CATEGORY}/\${PF}\" fi ${BODY} }"; |