diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-12-27 09:27:39 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-12-27 09:27:39 +0100 |
| commit | 33dec3abe229c58f38da90882eaa952debc48df2 (patch) | |
| tree | 569078605ed2a2dd21be0de7c99824a413aa76eb | |
| parent | dev-perl/AnyEvent: Stable for PPC64 (bug #569846). (diff) | |
| parent | virtualx.eclass: fix diagnostic messages in virtx() (diff) | |
| download | gentoo-33dec3abe229c58f38da90882eaa952debc48df2.tar.gz gentoo-33dec3abe229c58f38da90882eaa952debc48df2.tar.bz2 gentoo-33dec3abe229c58f38da90882eaa952debc48df2.zip | |
Merge branch 'Pesa-bug-569876'
* Pesa-bug-569876:
virtualx.eclass: fix diagnostic messages in virtx()
| -rw-r--r-- | eclass/virtualx.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index db1ecfa58b17..b56baa670acf 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 } |