1 | # Copyright 1999-2012 Gentoo Foundation |
1 | # Copyright 1999-2012 Gentoo Foundation |
2 | # Distributed under the terms of the GNU General Public License v2 |
2 | # Distributed under the terms of the GNU General Public License v2 |
3 | # $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.41 2012/09/29 20:48:58 chithanh Exp $ |
3 | # $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.42 2012/10/02 08:14:36 kensington Exp $ |
4 | |
4 | |
5 | # @ECLASS: virtualx.eclass |
5 | # @ECLASS: virtualx.eclass |
6 | # @MAINTAINER: |
6 | # @MAINTAINER: |
7 | # x11@gentoo.org |
7 | # x11@gentoo.org |
8 | # @AUTHOR: |
8 | # @AUTHOR: |
… | |
… | |
142 | |
142 | |
143 | export DISPLAY=:${XDISPLAY} |
143 | export DISPLAY=:${XDISPLAY} |
144 | # Do not break on error, but setup $retval, as we need |
144 | # Do not break on error, but setup $retval, as we need |
145 | # to kill Xvfb |
145 | # to kill Xvfb |
146 | debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" |
146 | debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" |
147 | ${VIRTUALX_COMMAND} "$@" |
147 | nonfatal ${VIRTUALX_COMMAND} "$@" |
148 | retval=$? |
148 | retval=$? |
149 | |
149 | |
150 | # Now kill Xvfb |
150 | # Now kill Xvfb |
151 | kill $(cat /tmp/.X${XDISPLAY}-lock) |
151 | kill $(cat /tmp/.X${XDISPLAY}-lock) |
152 | else |
152 | else |