From: kaf24@localhost.localdomain <kaf24@localhost.localdomain>
Date: Tue, 30 Jan 2007 13:42:19 +0000 (+0000)
Subject: Fix passing keymap parameter to xen-vncfb.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15368^2~30
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d63cf387192924b186a8263b3f502432ab4e977;p=xen.git

Fix passing keymap parameter to xen-vncfb.
Signed-off-by: Takanori Kasai <kasai.takanori@jp.fujitsu.com>
---

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index ac90ff177c..450e3283d1 100644
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -594,9 +594,9 @@ def configure_vfbs(config_devs, vals):
                           'xauthority', 'type', 'vncpasswd' ]:
                 err("configuration option %s unknown to vfbs" % k)
             config.append([k,v])
-        for n in iter(dir(vals)):
-            if n == "keymap":
-               config.append(['keymap',vals.keymap])
+        if not d.has_key("keymap"):
+            if vals.keymap:
+                config.append(['keymap',vals.keymap])
         if not d.has_key("display") and os.environ.has_key("DISPLAY"):
             config.append(["display", os.environ['DISPLAY']])
         if not d.has_key("xauthority"):