[Uludag-commits] r12264 - trunk/comar/zorg

[svn-uludag at uludag.org.tr]

Author: onur
Date: Tue Feb  6 02:51:26 2007
New Revision: 12264

Modified:
   trunk/comar/zorg/zorg
Log:
use /etc/mudur/keymap to set xorg.conf keyboard layout, fixes bug #4982

Modified: trunk/comar/zorg/zorg
=================================================================
--- trunk/comar/zorg/zorg	(original)
+++ trunk/comar/zorg/zorg	Tue Feb  6 02:51:26 2007
@@ -724,12 +724,10 @@
 def queryKeymap():
     # Fallback is trq
     kmap = "trq"
+    keymap_file = "/etc/mudur/keymap"
     try:
-        f = file("/etc/conf.d/mudur")
-        for line in f:
-            if line.strip().startswith("keymap="):
-                kmap = line.split('=')[1].strip().strip('"')
-        f.close()
+        if os.path.exists(keymap_file):
+            kmap = file(keymap_file).read().strip().rstrip("\n")
     except:
         pass