desktopcouch

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

  1. 527036
  2. Merge into trunk
Proposed by Chad Miller
Status: Merged
Approved by: Chad Miller
Approved revision: 150
Merged at revision: not available
Proposed branch: lp://qastaging/~cmiller/desktopcouch/527036
Merge into: lp://qastaging/desktopcouch
Diff against target: 37 lines (+8/-1)
2 files modified
desktopcouch/local_files.py (+6/-1)
desktopcouch/replication_services/ubuntuone.py (+2/-0)
To merge this branch: bzr merge lp://qastaging/~cmiller/desktopcouch/527036
Reviewer Review Type Date Requested Status
Elliot Murphy (community) Approve
Review via email: mp+23279@code.qastaging.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote :

Great, thanks for catching the other cases.

review: Approve
Revision history for this message
Elliot Murphy (statik) wrote :

Great, thanks for catching the other cases.

review: Approve
Revision history for this message
Elliot Murphy (statik) wrote :

Great, thanks for catching the other cases.

review: Approve

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