desktopcouch

Merge lp://qastaging/~fgiff/desktopcouch/527036 into lp://qastaging/desktopcouch

  1. 527036
  2. Merge into trunk
Proposed by Frans Gifford
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~fgiff/desktopcouch/527036
Merge into: lp://qastaging/desktopcouch
Diff against target: 13 lines (+3/-0)
1 file modified
desktopcouch/local_files.py (+3/-0)
To merge this branch: bzr merge lp://qastaging/~fgiff/desktopcouch/527036
Reviewer Review Type Date Requested Status
Chad Miller (community) Needs Fixing
Review via email: mp+23264@code.qastaging.launchpad.net

Commit message

Handle gnomekeyring.CancelledError exception from gnomekeyring dialog. (LP: #527036)

Description of the change

Fix #527036 by handling exception where gnomekeyring dialog is cancelled.

To post a comment you must log in.
Revision history for this message
Chad Miller (cmiller) wrote :

Hi Frans. Can you please add the same for all the locations where we access the keyring?

$ find . -name \*.py -type f -exec grep -l NoKeyringDaemonError {} /dev/null \;
./desktopcouch/tests/__init__.py
./desktopcouch/replication_services/ubuntuone.py
./desktopcouch/local_files.py

Add that and push again, and I will approve this outright and put it in the next release. There's not much time left!

review: Needs Fixing
Revision history for this message
Chad Miller (cmiller) wrote :

Sorry, I can wait no more. https://code.edge.launchpad.net/~cmiller/desktopcouch/527036

Thank you for the patch!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches