diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2004-08-26 09:16:14 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2004-08-26 09:16:14 +0000 |
| commit | b8aab7fdd0974f29013c98e3c25760a7269174b9 (patch) | |
| tree | 357814ed2ccd7dc004d12a3dacf710bfa9d06e7b /bin/ebuild.sh | |
| parent | document ARCH USERLAND PORTAGE_LIBC PROFILE_ARCH STAGE1_USE GRP_STAGE23_USE i... (diff) | |
| download | portage-cvs-b8aab7fdd0974f29013c98e3c25760a7269174b9.tar.gz portage-cvs-b8aab7fdd0974f29013c98e3c25760a7269174b9.tar.bz2 portage-cvs-b8aab7fdd0974f29013c98e3c25760a7269174b9.zip | |
removed the ebuild.sh PORT_LOGDIR kludge, implemented it via returnpid/fd_pipes for spawn (spawn was extended also).
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index ecfa732..a6f08ec 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.192 2004/08/24 18:08:12 ferringb Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.193 2004/08/26 09:16:14 ferringb Exp $ export SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/usr/lib/portage/pym:/dev/random" export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:${PORTAGE_TMPDIR}" @@ -15,29 +15,6 @@ if [ "$*" != "depend" ] && [ "$*" != "clean" ] && [ "$*" != "nofetch" ]; then if [ -f "${T}/successful" ]; then rm -f "${T}/successful" fi - - # Hurray for per-ebuild logging. - if [ ! -z "${PORT_LOGDIR}" ]; then - if [ -z "${PORT_LOGGING}" ]; then - export PORT_LOGGING=1 - export SANDBOX_WRITE="$SANDBOX_WRITE:${PORT_LOGDIR}" - install -d "${PORT_LOGDIR}" &>/dev/null - chown root:portage "${PORT_LOGDIR}" &>/dev/null - chmod g+rwxs "${PORT_LOGDIR}" &> /dev/null - touch "${PORT_LOGDIR}/${LOG_COUNTER}-${PF}.log" &> /dev/null - chmod g+w "${PORT_LOGDIR}/${LOG_COUNTER}-${PF}.log" &> /dev/null - echo "$*" >> "${PORT_LOGDIR}/${LOG_COUNTER}-${PF}.log" - { $0 "$@" || rm -f "${T}/successful" ; } 2>&1 \ - | tee -i -a "${PORT_LOGDIR}/${LOG_COUNTER}-${PF}.log" - if [ -f "${T}/successful" ]; then - rm -f "${T}/successful" - exit 0 - else - exit 1 - fi - fi - fi - if [ -f "${T}/environment" ]; then source "${T}/environment" &>/dev/null fi @@ -938,7 +915,6 @@ dyn_test() { if [ -d "${S}" ]; then cd "${S}" fi - if hasq maketest $RESTRICT; then ewarn "Skipping make test/check due to ebuild restriction." echo ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}" |