[PATCH 2/5] Don't write XkbVariants if none are specified

Vratislav Podzimek vpodzime at redhat.com
Fri Oct 5 17:32:04 UTC 2012


Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/keyboard.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index abfd184..0383a44 100755
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -94,8 +94,10 @@ def get_layouts_xorg_conf(keyboard):
     ret += '"' + ','.join(layouts) + '"\n'
 
     #variants
-    ret += '\tOption\t"XkbVariant"\t'
-    ret += '"' + ','.join(variants) + '"\n'
+    if any(variants):
+        #write out this line only if some variants are specified
+        ret += '\tOption\t"XkbVariant"\t'
+        ret += '"' + ','.join(variants) + '"\n'
 
     #switching
     #TODO: add option for switching combination
-- 
1.7.11.4



More information about the anaconda-patches mailing list