packages: system-config-keyboard/system-config-keyboard.spec, system-config...

[glen]

Author: glen                         Date: Sat Mar  3 16:47:08 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix parsing config if it contains other than key=value pairs

---- Files affected:
packages/system-config-keyboard:
   system-config-keyboard.spec (1.20 -> 1.21) , parse-config.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/system-config-keyboard/system-config-keyboard.spec
diff -u packages/system-config-keyboard/system-config-keyboard.spec:1.20 packages/system-config-keyboard/system-config-keyboard.spec:1.21
--- packages/system-config-keyboard/system-config-keyboard.spec:1.20	Sat Mar  3 17:46:13 2012
+++ packages/system-config-keyboard/system-config-keyboard.spec	Sat Mar  3 17:47:03 2012
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Graficzny interfejs do zmiany klawiatury
 Name:		system-config-keyboard
 Version:	1.3.1
-Release:	0.14
+Release:	1
 License:	GPL v2+
 Group:		Base
 Source0:	https://fedorahosted.org/releases/s/y/system-config-keyboard/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Patch0:		s-c-keyboard-do_not_remove_the_OK_button.patch
 Patch1:		sck-1.3.1-no-pyxf86config.patch
 Patch2:		kbdconf.patch
+Patch3:		parse-config.patch
 URL:		https://fedorahosted.org/system-config-keyboard/
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
@@ -39,6 +40,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__make}
@@ -102,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2012/03/03 16:47:03  glen
+- fix parsing config if it contains other than key=value pairs
+
 Revision 1.20  2012/03/03 16:46:13  glen
 - process proper file for keyboard layouts
 

================================================================
Index: packages/system-config-keyboard/parse-config.patch
diff -u /dev/null packages/system-config-keyboard/parse-config.patch:1.1
--- /dev/null	Sat Mar  3 17:47:08 2012
+++ packages/system-config-keyboard/parse-config.patch	Sat Mar  3 17:47:03 2012
@@ -0,0 +1,16 @@
+--- system-config-keyboard-1.3.1/lib/keyboard.py~	2012-03-03 18:27:49.000000000 +0200
++++ system-config-keyboard-1.3.1/lib/keyboard.py	2012-03-03 18:43:13.246317693 +0200
+@@ -128,7 +128,12 @@
+                 line = file.readline ()
+                 if not line:
+                         break
+-                (name, value) = line.rstrip("\n").split ('=')
++                parts = line.rstrip("\n").split ('=')
++                if len(parts) >= 2:
++                    (name, value) = line.rstrip("\n").split ('=')
++                else:
++                    (name, value) = ("", "")
++
+                 self.config.append ([line, name, value.strip ('"'), 0])
+         self.beenset = 1
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/system-config-keyboard/system-config-keyboard.spec?r1=1.20&r2=1.21&f=u