Merge lp:~jszakmeister/bzr-gtk/return-creds into lp:bzr-gtk/gtk2

Proposed by John Szakmeister
Status: Merged
Merged at revision: 690
Proposed branch: lp:~jszakmeister/bzr-gtk/return-creds
Merge into: lp:bzr-gtk/gtk2
Diff against target: 25 lines (+4/-0)
2 files modified
NEWS (+3/-0)
keyring.py (+1/-0)
To merge this branch: bzr merge lp:~jszakmeister/bzr-gtk/return-creds
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) Approve
Review via email: mp+26798@code.launchpad.net

Description of the change

Return the credentials after fetching them. I used a small script to setup a password for a bzr installation, and found this bug when it kept asking for my password.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-05-27 02:02:26 +0000
3+++ NEWS 2010-06-04 12:20:39 +0000
4@@ -10,6 +10,9 @@
5 * Don't crash when there is already a lan-notify instance running.
6 (Jelmer Vernooij, #339284)
7
8+ * Return the credntials if successfully found in gnome-keyring.
9+ (John Szakmeister)
10+
11 FEATURES
12
13 * Add 'Find' button to start text search.
14
15=== modified file 'keyring.py'
16--- keyring.py 2010-03-09 01:21:41 +0000
17+++ keyring.py 2010-06-04 12:20:39 +0000
18@@ -77,6 +77,7 @@
19 gnomekeyring.ITEM_NETWORK_PASSWORD, attrs)
20 credentials["user"] = items[0].attributes["user"]
21 credentials["password"] = items[0].secret
22+ return credentials
23 except (gnomekeyring.NoMatchError, gnomekeyring.DeniedError, gnomekeyring.NoKeyringDaemonError,
24 gnomekeyring.IOError), e:
25 from bzrlib import trace

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: