aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-07-25 20:29:10 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-07-25 20:29:10 +0000
commit4fcb7dd6c2719f7bc18674b502aaf8a030bc00da (patch)
treed163da7f0448f7fd2bcfa44298783b0171fde10d /targets/support/chroot-functions.sh
parentFix the splash code so we have our splash theme on all 6 virtual consoles, as... (diff)
downloadcatalyst-4fcb7dd6c2719f7bc18674b502aaf8a030bc00da.tar.gz
catalyst-4fcb7dd6c2719f7bc18674b502aaf8a030bc00da.tar.bz2
catalyst-4fcb7dd6c2719f7bc18674b502aaf8a030bc00da.zip
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
Diffstat (limited to 'targets/support/chroot-functions.sh')
-rwxr-xr-xtargets/support/chroot-functions.sh12
1 files changed, 9 insertions, 3 deletions
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 6a2f26cb..540f40e4 100755
--- 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 ]