/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 keyring.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-09 01:36:22 UTC
  • mfrom: (684.1.2 trunk)
  • Revision ID: jelmer@samba.org-20100309013622-o24zdem931bqk6fy
https://launchpad.net/bugs/534326
Ignore gnomekeyring.IOError when checking if credentials are available 
in the GNOME keyring.

Show diffs side-by-side

added added

removed removed

Lines of Context:
keyring.py
77
77
                gnomekeyring.ITEM_NETWORK_PASSWORD, attrs)
78
78
            credentials["user"] = items[0].attributes["user"]
79
79
            credentials["password"] = items[0].secret
80
 
        except (gnomekeyring.NoMatchError, gnomekeyring.DeniedError, gnomekeyring.NoKeyringDaemonError):
 
80
        except (gnomekeyring.NoMatchError, gnomekeyring.DeniedError, gnomekeyring.NoKeyringDaemonError,
 
81
                gnomekeyring.IOError), e:
 
82
            from bzrlib import trace
 
83
            trace.mutter('Unable to obtain credentials for %r from GNOME keyring: %r',
 
84
                         attrs, e)
81
85
            return None