[PATCH] Ignore the server keymap for spoke status if using VNC (#1045115)

David Shea dshea at redhat.com
Tue Mar 4 15:25:53 UTC 2014


Since VNC sends keysyms instead of keycodes, setting the keymap on the
server side doesn't really have any effect. Ignore the keymap reported
by the server when determining whether the keyboard spoke is completed
so as not to block kickstart installs that use VNC.
---
 pyanaconda/ui/gui/spokes/keyboard.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 5a8ad51..e7479f1 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -297,9 +297,12 @@ class KeyboardSpoke(NormalSpoke):
     def completed(self):
         if flags.flags.automatedInstall and not self.data.keyboard.seen:
             return False
-        elif not self._confirmed and self._xkl_wrapper.get_current_layout() != self.data.keyboard.x_layouts[0]:
+        elif not self._confirmed and \
+                self._xkl_wrapper.get_current_layout() != self.data.keyboard.x_layouts[0] and \
+                not flags.flags.usevnc:
             # the currently activated layout is a different one from the
-            # installed system's default
+            # installed system's default. Ignore VNC, since VNC keymaps are
+            # weird and more on the client side.
             return False
         else:
             return True
-- 
1.8.5.3



More information about the anaconda-patches mailing list