Merged from trunk 5141:5143

Make sure QUIET mode is exported to the environment properly when using
-q mode.

No point in forking a call to true when we can simply use the bash
internal of : for true.

svn path=/main/branches/prefix/; revision=5145

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 81c6a0223f0cd6eca3f918d5395610983c9cc3f0..dfedfff26da8f649005cf3169c73716188e03727 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -60,6 +60,7 @@ case "${NOCOLOR:-false}" in
                ;;
 esac
 
+[[ $PORTAGE_QUIET != "" ]] && export PORTAGE_QUIET
 
 # the sandbox is disabled by default except when overridden in the relevant stages
 export SANDBOX_ON="0"

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 7a58cd57a219c0f563866786eb29d8a3302db1d4..09268dae3e73eb354eadd1582d109b09c17cc9a9 100644 (file)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -464,4 +464,4 @@ if [ -n "${MISC_FUNCTIONS_ARGS}" ]; then
        done
 fi
 
-true
+: