SOURCES: hal-device_manager.patch - up to hal 0.5.3

[wrobell]

Author: wrobell                      Date: Wed Jul 13 18:25:16 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to hal 0.5.3

---- Files affected:
SOURCES:
   hal-device_manager.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/hal-device_manager.patch
diff -u SOURCES/hal-device_manager.patch:1.2 SOURCES/hal-device_manager.patch:1.3
--- SOURCES/hal-device_manager.patch:1.2	Thu May 19 17:02:24 2005
+++ SOURCES/hal-device_manager.patch	Wed Jul 13 20:25:11 2005
@@ -1,6 +1,7 @@
---- hal-0.5.2/tools/device-manager/DeviceManager.py.orig	2005-04-27 21:15:37.000000000 +0200
-+++ hal-0.5.2/tools/device-manager/DeviceManager.py	2005-05-19 16:40:29.000000000 +0200
-@@ -261,13 +261,16 @@
+diff -Nur hal-0.5.3.orig/tools/device-manager/DeviceManager.py hal-0.5.3/tools/device-manager/DeviceManager.py
+--- hal-0.5.3.orig/tools/device-manager/DeviceManager.py	2005-07-11 18:26:58.000000000 +0100
++++ hal-0.5.3/tools/device-manager/DeviceManager.py	2005-07-13 19:16:10.000000000 +0100
+@@ -264,16 +264,19 @@
          for name in device_names:
              device_dbus_obj = self.bus.get_object("org.freedesktop.Hal" ,name)
              properties = device_dbus_obj.GetAllProperties(dbus_interface="org.freedesktop.Hal.Device")
@@ -9,6 +10,9 @@
 -            except KeyError:
 -                # no parent, must be parent of virtual_root
 -                parent_name = "/"
+-            except TypeError:
+-                print "Error: no properties for device %s"%name
+-                continue
 -            device = Device(name, parent_name, properties)
 -            self.device_list.append(device)
 +            if properties == None:
@@ -19,6 +23,9 @@
 +                except KeyError:
 +                    # no parent, must be parent of virtual_root
 +                    parent_name = "/"
++                except TypeError:
++                    print "Error: no properties for device %s"%name
++                    continue
 +                device = Device(name, parent_name, properties)
 +                self.device_list.append(device)
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/hal-device_manager.patch?r1=1.2&r2=1.3&f=u