/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: Toshio Kuratomi
  • Date: 2010-04-13 15:06:17 UTC
  • mto: This revision was merged to the branch mainline in revision 693.
  • Revision ID: toshio@fedoraproject.org-20100413150617-e37qx1qgdewh0n8o
Fix bzr-handle-patch to process patches with leading and trailing comments with
newer bzrlib.

Show diffs side-by-side

added added

removed removed

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