Added check for verbose, and add --verbose if found, or --quiet, to emerge options.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1165 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index f57d984929eb1accdb8158bcf440c7e94cb26a49..9660f27439306fa52be5e8789b1d85bab69d33b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.649 2006/07/21 16:16:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.650 2006/07/25 20:29:10 wolf31o2 Exp $
+
+  25 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/chroot-functions.sh:
+  Added check for verbose, and add --verbose if found, or --quiet, to emerge
+  options.
 
   21 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 6a2f26cbd184ea3b5cf345487b767531869092c0..540f40e4d6f4a8dc22e85f330f57da9343821390 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -64,9 +64,15 @@ setup_myfeatures(){
 }
 
 setup_myemergeopts(){
+       if [ -n "${clst_VERBOSE}" ]
+       then
+               clst_myemergeopts="--verbose"
+       else
+               clst_myemergeopts="--quiet"
+       fi
        if [ -n "${clst_PKGCACHE}" ]
        then
-               export clst_myemergeopts="--usepkg --buildpkg --newuse"
+               export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
                export bootstrap_opts="-r"
        fi
        if [ -n "${clst_FETCH}" ]
@@ -154,8 +160,8 @@ run_emerge() {
 
        if [ -n "${clst_VERBOSE}" ]
        then
-               echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -vpt $@" || exit 1
-               emerge ${clst_myemergeopts} -vpt $@ || exit 3
+               echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
+               emerge ${clst_myemergeopts} -pt $@ || exit 3
                echo "Press any key within 15 seconds to pause the build..."
                read -s -t 15 -n 1
                if [ $? -eq 0 ]