summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDavide Pesavento <davidepesa@gmail.com>2015-12-27 01:04:28 +0100
committerDavide Pesavento <davidepesa@gmail.com>2015-12-27 01:04:28 +0100
commit59e0cdef8d97610eda3ea3f28bdf562376a828a0 (patch)
treef15833257afc965d1929434e6b911536d9b542f4 /eclass
parentdev-perl/Apache-Test: amd64 stable wrt bug #569852 (diff)
downloadgentoo-59e0cdef8d97610eda3ea3f28bdf562376a828a0.tar.gz
gentoo-59e0cdef8d97610eda3ea3f28bdf562376a828a0.tar.bz2
gentoo-59e0cdef8d97610eda3ea3f28bdf562376a828a0.zip
virtualx.eclass: fix diagnostic messages in virtx()
Gentoo-Bug: 569876
Diffstat (limited to 'eclass')
-rw-r--r--eclass/virtualx.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index db1ecfa58b1..b56baa670ac 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -205,7 +205,7 @@ virtx() {
export DISPLAY=:${XDISPLAY}
# Do not break on error, but setup $retval, as we need
# to kill Xvfb
- debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
+ debug-print "${FUNCNAME}: $@"
if has "${EAPI}" 2 3; then
"$@"
retval=$?
@@ -218,7 +218,7 @@ virtx() {
kill $(cat /tmp/.X${XDISPLAY}-lock)
# die if our command failed
- [[ ${retval} -ne 0 ]] && die "${FUNCNAME}: the ${VIRTUALX_COMMAND} failed."
+ [[ ${retval} -ne 0 ]] && die "Failed to run '$@'"
return 0 # always return 0, it can be altered by failed kill for Xvfb
}