[gentoo-commits] repo/gentoo:master commit in: eclass/

[Justin Lecher]

commit:     59e0cdef8d97610eda3ea3f28bdf562376a828a0
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 00:04:28 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 00:04:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e0cdef

virtualx.eclass: fix diagnostic messages in virtx()

Gentoo-Bug: 569876

 eclass/virtualx.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index db1ecfa..b56baa6 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
 }