[PATCH xserver] xkb: Print the xkbcomp path being executed when we fail to compile.

Peter Hutterer peter.hutterer at who-t.net
Wed Nov 1 00:41:46 UTC 2017


On Tue, Oct 31, 2017 at 12:22:31PM -0700, Eric Anholt wrote:
> I don't know how many times I've had a broken server due to a bad
> directory to xkbcomp, and only finding the whole path has shown me
> where I went wrong.
> ---
>  xkb/ddxLoad.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
> index f71815aa814b..bbe39524557a 100644
> --- a/xkb/ddxLoad.c
> +++ b/xkb/ddxLoad.c
> @@ -191,8 +191,10 @@ RunXkbComp(xkbcomp_buffer_callback callback, void *userdata)
>  #endif
>              return xnfstrdup(keymap);
>          }
> -        else
> -            LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
> +        else {
> +            LogMessage(X_ERROR, "Error compiling keymap (%s) executing '%s'\n",
> +                       keymap, buf);
> +        }
>  #ifdef WIN32
>          /* remove the temporary file */
>          unlink(tmpname);
> -- 
> 2.15.0

oooh, fancy! Just what I needed today

remote: Updating patchwork state for https://patchwork.freedesktop.org/project/Xorg/list/
remote: I: patch #185582 updated using rev 30f4d440ebc3517fdcc1d3c6a422a8fbf3af1f23.
remote: I: 1 patch(es) updated to state Accepted.
To git+ssh://git.freedesktop.org/git/xorg/xserver
   14af8bee2..30f4d440e  master -> master

Cheers,
   Peter


More information about the xorg-devel mailing list