Skip to content

Commit

Permalink
virtualx.eclass: fix diagnostic messages in virtx()
Browse files Browse the repository at this point in the history
Gentoo-Bug: 569876
  • Loading branch information
Pesa committed Dec 27, 2015
1 parent d8bbb70 commit 59e0cde
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions eclass/virtualx.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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=$?
Expand All @@ -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
}
Expand Down

0 comments on commit 59e0cde

Please sign in to comment.