[PATCH 3/3] Only try to activate layouts if runtime system can be changed

Vratislav Podzimek vpodzime at redhat.com
Thu May 16 10:49:41 UTC 2013


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 9b8567f..a3f0044 100755
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -37,6 +37,7 @@ import os
 import shutil
 
 from pyanaconda import iutil
+from pyanaconda import flags
 from pyanaconda.safe_dbus import dbus_call_safe_sync, dbus_get_property_safe_sync
 from pyanaconda.safe_dbus import DBUS_SYSTEM_BUS_ADDR, DBusPropertyError
 
@@ -363,7 +364,7 @@ class XklWrapper(object):
         #variants lists to have the same length. Add "" padding to variants.
         #See docstring of the add_layout method for details.
         diff = len(self._rec.layouts) - len(self._rec.variants)
-        if diff > 0:
+        if diff > 0 and flags.can_touch_runtime_system("activate layouts"):
             self._rec.set_variants(self._rec.variants + (diff * [""]))
             if not self._rec.activate(self._engine):
                 # failed to activate layouts given e.g. by a kickstart (may be
-- 
1.7.11.7



More information about the anaconda-patches mailing list