[PATCH] Don't rely on X server adding empty variant for its defaults (#1011658)

Chris Lumens clumens at redhat.com
Tue Sep 24 19:33:43 UTC 2013


> diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
> index e86771a..48a2789 100644
> --- a/pyanaconda/keyboard.py
> +++ b/pyanaconda/keyboard.py
> @@ -514,7 +514,11 @@ class XklWrapper(object):
>              cur_group = num_groups - 1
>  
>          layout = self._rec.layouts[cur_group]
> -        variant = self._rec.variants[cur_group]
> +        try:
> +            variant = self._rec.variants[cur_group]
> +        except IndexError:
> +            # X server may have forgotten to add the "" variant for its default layout
> +            variant = ""
>  
>          self._engine.stop_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE)

This looks fine too.

- Chris


More information about the anaconda-patches mailing list