/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-06-04 12:25:04 UTC
  • mfrom: (689.1.1 return-creds)
  • Revision ID: jelmer@samba.org-20100604122504-xe291u8la5uur0ij
Merge credentials fix from John.

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
            return credentials
80
81
        except (gnomekeyring.NoMatchError, gnomekeyring.DeniedError, gnomekeyring.NoKeyringDaemonError,
81
82
                gnomekeyring.IOError), e:
82
83
            from bzrlib import trace