From 0c0a97db4243ffb44b5b7b31eea194fef7d49cb8 Mon Sep 17 00:00:00 2001 From: Simon Stelling Date: Thu, 24 Aug 2006 18:51:56 +0000 Subject: [PATCH] only print the "Removing /usr/share/info" if --quiet was not passed svn path=/main/trunk/; revision=4339 --- bin/isolated-functions.sh | 8 ++++++-- bin/misc-functions.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index dcd230844..de62d8611 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -2,11 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 # $Header$ -# Internal logging function, don't use this in ebuilds +quiet_mode() { + [[ ${PORTAGE_QUIET} -eq 1 ]] +} + vecho() { - [[ ${PORTAGE_QUIET} == "1" ]] || echo "$@" + quiet_mode || echo "$@" } +# Internal logging function, don't use this in ebuilds elog_base() { local messagetype [ -z "${1}" -o -z "${T}" -o ! -d "${T}/logging" ] && return 1 diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 6e0fbac09..e4d0d908f 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -221,7 +221,7 @@ install_mask() { set -o noglob for no_inst in ${install_mask}; do set +o noglob - einfo "Removing ${no_inst}" + quiet_mode || einfo "Removing ${no_inst}" # normal stuff rm -Rf ${root}/${no_inst} >&/dev/null -- 2.26.2