From 97cb4e679bfce35b3fc9a5edf388aad85ef41ca0 Mon Sep 17 00:00:00 2001 From: lxnay Date: Tue, 7 Nov 2006 14:11:36 +0000 Subject: [PATCH] small fix git-svn-id: http://svn.sabayonlinux.org/overlay@238 d7aec97c-591d-0410-af39-a8856400b30a --- sys-apps/keyboard-configuration-helpers/Manifest | 8 ++++---- .../files/2.0/keyboard-setup | 14 +++++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sys-apps/keyboard-configuration-helpers/Manifest b/sys-apps/keyboard-configuration-helpers/Manifest index 49531df6f..72dddf974 100644 --- a/sys-apps/keyboard-configuration-helpers/Manifest +++ b/sys-apps/keyboard-configuration-helpers/Manifest @@ -2,10 +2,10 @@ AUX 1.0/keyboard-setup 4855 RMD160 e60323fe8aa888c990c115e8bb8091c5f45dfe21 SHA1 MD5 fb4e5855fda94d028d9dddb7ad5556d6 files/1.0/keyboard-setup 4855 RMD160 e60323fe8aa888c990c115e8bb8091c5f45dfe21 files/1.0/keyboard-setup 4855 SHA256 34d0e18cae0474f0fda026b9ab1937ff17aac70c3063bbf5c33e01ff9b8ec0e0 files/1.0/keyboard-setup 4855 -AUX 2.0/keyboard-setup 7627 RMD160 b25e54cdf2cc3d47e446174bdc7377f5ace84de8 SHA1 a9e35c1a45358c446f1701089f3f01556e323923 SHA256 4edf35309b2da4296addcc606477e3cef0329e19020c60788323d863f1eac3c7 -MD5 a4e0dc89c93aaa722884b60c00d494a3 files/2.0/keyboard-setup 7627 -RMD160 b25e54cdf2cc3d47e446174bdc7377f5ace84de8 files/2.0/keyboard-setup 7627 -SHA256 4edf35309b2da4296addcc606477e3cef0329e19020c60788323d863f1eac3c7 files/2.0/keyboard-setup 7627 +AUX 2.0/keyboard-setup 7846 RMD160 e6286b954a12efd81de32ec48ffe3690b767f944 SHA1 09f402336d19c979694de3dcc5b4bbed5f8215cd SHA256 3d2637531b361c0ce0487c3a4b0add1e47fdd380b309bd28932580db8f424247 +MD5 d0a3a3d13acee4f2b4b4a1c55ffd8ce2 files/2.0/keyboard-setup 7846 +RMD160 e6286b954a12efd81de32ec48ffe3690b767f944 files/2.0/keyboard-setup 7846 +SHA256 3d2637531b361c0ce0487c3a4b0add1e47fdd380b309bd28932580db8f424247 files/2.0/keyboard-setup 7846 EBUILD keyboard-configuration-helpers-1.0.ebuild 519 RMD160 171dee371bd6d26bec9454977192c79d8d885b2c SHA1 08fdc33b2d9bfd2c1ff76426f27b67acf1e6329e SHA256 cd092c825489e4ebbe57917df96e6d70d1189117c4a21a196ac073c5f206f76d MD5 21fb6c5f38f2c3f9efbea24b9df5f164 keyboard-configuration-helpers-1.0.ebuild 519 RMD160 171dee371bd6d26bec9454977192c79d8d885b2c keyboard-configuration-helpers-1.0.ebuild 519 diff --git a/sys-apps/keyboard-configuration-helpers/files/2.0/keyboard-setup b/sys-apps/keyboard-configuration-helpers/files/2.0/keyboard-setup index 8bafd04cd..29a2d6e04 100755 --- a/sys-apps/keyboard-configuration-helpers/files/2.0/keyboard-setup +++ b/sys-apps/keyboard-configuration-helpers/files/2.0/keyboard-setup @@ -133,12 +133,20 @@ def configureXorgKeymap(keyLocale): print_warning("XkbLayout entry not found") # create it trigger = False + triggerKbd = False for line in xorgConfContent: if (trigger): + if line.find("Driver") != -1 and line.find("kbd") != -1: + triggerKbd = True if line.find("EndSection") != -1: - # end of line, add the option here: - line = " Option \"XkbLayout\" \""+keyLocale+"\"\n\n"+line - trigger = False + if (triggerKbd): + # end of line, add the option here: + line = " Option \"XkbLayout\" \""+keyLocale+"\"\n\n"+line + trigger = False + triggerKbd = False + else: + # false alarm + trigger = False if line.find("Section") != -1 and line.find("InputDevice") != -1: trigger = True newXorgConf.append(line)