[rhel7/f20/master] Fix the Gkbd spec string for layouts with no variant

David Shea dshea at redhat.com
Mon Oct 28 20:13:48 UTC 2013


Don't add the "\tvariant" if the variant is empty.

Resolves: rhbz#1011155
---
 pyanaconda/ui/gui/spokes/keyboard.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 6a63f45..7ba4cdf 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -491,7 +491,12 @@ class KeyboardSpoke(NormalSpoke):
             return
 
         layout, variant = keyboard.parse_layout_variant(layout_row[0])
-        lay_var_spec = "%s\t%s" % (layout, variant)
+
+        if variant:
+            lay_var_spec = "%s\t%s" % (layout, variant)
+        else:
+            lay_var_spec = layout
+
         dialog = Gkbd.KeyboardDrawing.dialog_new()
         Gkbd.KeyboardDrawing.dialog_set_layout(dialog, self._xkl_wrapper.configreg,
                                                lay_var_spec)
-- 
1.8.3.1



More information about the anaconda-patches mailing list