rpms/gnome-lirc-properties/devel glp-hiddev-bt.patch, NONE, 1.1 gnome-lirc-properties.spec, 1.13, 1.14

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26438

Modified Files:
	gnome-lirc-properties.spec 
Added Files:
	glp-hiddev-bt.patch 
Log Message:
* Mon Oct 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.0-4
- Fix USB hiddev devices causing backtraces


glp-hiddev-bt.patch:

--- NEW FILE glp-hiddev-bt.patch ---
Index: gnome_lirc_properties/hardware.py
===================================================================
--- gnome_lirc_properties/hardware.py	(revision 73)
+++ gnome_lirc_properties/hardware.py	(working copy)
@@ -488,10 +488,13 @@
         for udi in self.__hal.FindDeviceStringMatch('info.subsystem', 'usb_device'):
             device = self.lookup_device(udi)
 
-            if (device['usb_device.vendor_id'] == receiver.vendor_id and
-                device['usb_device.product_id'] == receiver.product_id):
-                return device.find_device_node(receiver.kernel_module,
-                                               receiver.lirc_driver)
+	    try:
+                if (device['usb_device.vendor_id'] == receiver.vendor_id and
+                    device['usb_device.product_id'] == receiver.product_id):
+                    return device.find_device_node(receiver.kernel_module,
+						   receiver.lirc_driver)
+	    except KeyError, key:
+	        continue
 
         return None
 


Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/gnome-lirc-properties.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-lirc-properties.spec	27 Oct 2008 12:41:04 -0000	1.13
+++ gnome-lirc-properties.spec	27 Oct 2008 12:51:55 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:		gnome-lirc-properties
 Version:	0.3.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Infrared Remote Controls setup tool
 
 Group:		User Interface/X Hardware Support
@@ -24,6 +24,7 @@
 Patch2:		glp-remove-snapstream.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=557977#c4
 Patch3:		glp-dont-detect-kbd-no-buttons.patch
+Patch4:		glp-hiddev-bt.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -51,6 +52,7 @@
 %patch1 -p0 -b .no-fluendo-remotes
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
 
 %build
 %configure --disable-conf-check --with-lirc-confdir=%{_sysconfdir} --with-remotes-database=%{_datadir}/lirc-remotes/
@@ -101,6 +103,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Mon Oct 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.0-4
+- Fix USB hiddev devices causing backtraces
+
 * Mon Oct 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.0-3
 - Don't detect power buttons