| 1 |
commit: 59e0cdef8d97610eda3ea3f28bdf562376a828a0 |
| 2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 27 00:04:28 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 27 00:04:28 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e0cdef |
| 7 |
|
| 8 |
virtualx.eclass: fix diagnostic messages in virtx() |
| 9 |
|
| 10 |
Gentoo-Bug: 569876 |
| 11 |
|
| 12 |
eclass/virtualx.eclass | 4 ++-- |
| 13 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass |
| 16 |
index db1ecfa..b56baa6 100644 |
| 17 |
--- a/eclass/virtualx.eclass |
| 18 |
+++ b/eclass/virtualx.eclass |
| 19 |
@@ -205,7 +205,7 @@ virtx() { |
| 20 |
export DISPLAY=:${XDISPLAY} |
| 21 |
# Do not break on error, but setup $retval, as we need |
| 22 |
# to kill Xvfb |
| 23 |
- debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" |
| 24 |
+ debug-print "${FUNCNAME}: $@" |
| 25 |
if has "${EAPI}" 2 3; then |
| 26 |
"$@" |
| 27 |
retval=$? |
| 28 |
@@ -218,7 +218,7 @@ virtx() { |
| 29 |
kill $(cat /tmp/.X${XDISPLAY}-lock) |
| 30 |
|
| 31 |
# die if our command failed |
| 32 |
- [[ ${retval} -ne 0 ]] && die "${FUNCNAME}: the ${VIRTUALX_COMMAND} failed." |
| 33 |
+ [[ ${retval} -ne 0 ]] && die "Failed to run '$@'" |
| 34 |
|
| 35 |
return 0 # always return 0, it can be altered by failed kill for Xvfb |
| 36 |
} |
Archives