SOURCES: bzr-gtk-dbus_detection_fix.patch (NEW) - Release 2. Fix for detect...

matkor matkor at pld-linux.org
Wed Aug 6 08:52:27 CEST 2008


Author: matkor                       Date: Wed Aug  6 06:52:27 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Release 2. Fix for detecting dbus availability.

---- Files affected:
SOURCES:
   bzr-gtk-dbus_detection_fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/bzr-gtk-dbus_detection_fix.patch
diff -u /dev/null SOURCES/bzr-gtk-dbus_detection_fix.patch:1.1
--- /dev/null	Wed Aug  6 08:52:27 2008
+++ SOURCES/bzr-gtk-dbus_detection_fix.patch	Wed Aug  6 08:52:21 2008
@@ -0,0 +1,17 @@
+=== modified file 'seahorse.py'
+--- old/seahorse.py	2008-07-23 00:07:09 +0000
++++ new/seahorse.py	2008-08-05 13:55:03 +0000
+@@ -40,6 +40,12 @@
+         name = get_name()
+     else:
+         name = getattr(e, '_dbus_error_name', None)
++        
++    if name is None:
++        args = getattr(e, 'args', None) # This is case for old python-dbus-0.62
++        if args == ("Unable to determine the address of the message bus (try 'man dbus-launch' and 'man dbus-daemon' for help)",):
++            raise ImportError
++        
+     # DBus sometimes fails like this, just treat it as if seahorse is not
+     # available rather than crashing.
+     if name in ("org.freedesktop.DBus.Error.Spawn.ExecFailed", 
+
================================================================


More information about the pld-cvs-commit mailing list