/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to seahorse.py

  • Committer: Curtis Hovey
  • Date: 2011-08-29 14:12:30 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110829141230-6nv7h0oxjrojb1y1
Updated hacking doc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
seahorse.py
40
40
        name = get_name()
41
41
    else:
42
42
        name = getattr(e, '_dbus_error_name', None)
 
43
 
 
44
    if name is None:
 
45
        args = getattr(e, 'args', None) # This is case for old python-dbus-0.62
 
46
        if args == ("Unable to determine the address of the message bus (try 'man dbus-launch' and 'man dbus-daemon' for help)",):
 
47
            raise ImportError
 
48
 
43
49
    # DBus sometimes fails like this, just treat it as if seahorse is not
44
50
    # available rather than crashing.
45
51
    if name in ("org.freedesktop.DBus.Error.Spawn.ExecFailed", 
46
 
                "org.freedesktop.DBus.Error.ServiceUnknown"):
 
52
                "org.freedesktop.DBus.Error.ServiceUnknown",
 
53
                "org.freedesktop.DBus.Error.NotSupported"):
47
54
        raise ImportError
48
55
    else:
49
56
        raise