[master/rhel7-branch][PATCH] Skip empty layout-variant specifications when setting layouts (#1054083)

Vratislav Podzimek vpodzime at redhat.com
Thu Jan 16 09:39:03 UTC 2014


Otherwise parsing raises an exception.

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

diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index 0c15153..a20e7de 100755
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -828,7 +828,8 @@ class LocaledWrapper(object):
         layouts = []
         variants = []
 
-        for layout_variant in layouts_variants:
+        for layout_variant in (nonempty for nonempty in layouts_variants
+                               if nonempty):
             (layout, variant) = parse_layout_variant(layout_variant)
             layouts.append(layout)
             variants.append(variant)
-- 
1.8.4.2



More information about the anaconda-patches mailing list