diff options
| author |   Jonathan Callen <jcallen@gentoo.org> | 2009-12-21 17:27:28 +0000 |
|---|---|---|
| committer | Jonathan Callen <jcallen@gentoo.org> | 2009-12-21 17:27:28 +0000 |
| commit | 4f1b512cf07a9f62a711e368a0ff8494d30d9305 (patch) | |
| tree | f143669776347682947b5bb3725580c6654268b8 /eclass | |
| parent | dev-python/sclapp: Integrate testsuite patch (diff) | |
| download | historical-4f1b512cf07a9f62a711e368a0ff8494d30d9305.tar.gz historical-4f1b512cf07a9f62a711e368a0ff8494d30d9305.tar.bz2 historical-4f1b512cf07a9f62a711e368a0ff8494d30d9305.zip | |
Remove usage of SANDBOX_DISABLED, per bug 107479
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/virtualx.eclass | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 55559998802c..a0b37d776e6c 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.32 2009/10/21 23:59:51 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.33 2009/12/21 17:27:28 abcd Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -44,18 +44,9 @@ esac DESCRIPTION="Based on the $ECLASS eclass" -# -# Brian Harring <ferringb@gentoo.org> 11/04/2004 -# do not disable the sandbox during the depend phase. -# ebuilds shouldn't touch the fs during depend phase, nor screw with the sandbox. -# -if [[ ${EBUILD_PHASE/depend} == "${EBUILD_PHASE}" ]] ; then - [[ -z ${SANDBOX_DISABLED} ]] && export SANDBOX_DISABLED="0" || : -fi - virtualmake() { local retval=0 - local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" + local OLD_SANDBOX_ON="${SANDBOX_ON}" local XVFB=$(type -p Xvfb) local XHOST=$(type -p xhost) @@ -70,7 +61,7 @@ virtualmake() { einfo "Scanning for an open DISPLAY to start Xvfb ..." # We really do not want SANDBOX enabled here - export SANDBOX_DISABLED="1" + export SANDBOX_ON="0" local i=0 XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i}) @@ -119,7 +110,7 @@ virtualmake() { done # Now enable SANDBOX again if needed. - export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" + export SANDBOX_ON="${OLD_SANDBOX_ON}" einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." |