[Pkg-bazaar-commits] ./bzr-gtk/unstable r601: Merge fix for handling obsolete dbus instances

[Jasper Groenewegen]

------------------------------------------------------------
revno: 601
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Sun 2008-08-24 22:42:11 +0200
message:
  Merge fix for handling obsolete dbus instances
modified:
  seahorse.py
    ------------------------------------------------------------
    revno: 597.3.1
    committer: Mateusz Korniak (matkor at laptop-hp)
    branch nick: trunk-matkor
    timestamp: Tue 2008-08-05 15:56:46 +0200
    message:
      Detection of error opening dbus when python-dbus-0.62 is used.
    modified:
      seahorse.py
-------------- next part --------------
=== modified file 'seahorse.py'
--- a/seahorse.py	2008-07-23 00:07:09 +0000
+++ b/seahorse.py	2008-08-05 13:56:46 +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",