Merge lp://staging/~rye/ubuntuone-client/handle-dbus-errback-in-launcher-stable-1-4 into lp://staging/ubuntuone-client/stable-1-4
Proposed by
Roman Yepishev
| Status: | Merged |
|---|---|
| Approved by: | Roman Yepishev |
| Approved revision: | 731 |
| Merged at revision: | 733 |
| Proposed branch: | lp://staging/~rye/ubuntuone-client/handle-dbus-errback-in-launcher-stable-1-4 |
| Merge into: | lp://staging/ubuntuone-client/stable-1-4 |
| Diff against target: |
12 lines (+1/-1) 1 file modified
bin/ubuntuone-launch (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~rye/ubuntuone-client/handle-dbus-errback-in-launcher-stable-1-4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| John Lenton (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Wait for READY signal even if dbus client calls d.errback
Description of the change
How to test:
1. Put a lot of files and cause syncdaemon to timeout during startup dbus call.
2. Reboot.
3. Syncdaemon should be in READY state
4. Apply the patch
5. Reboot
6. Syncdaemon should be in QUEUE_MANAGER state
This happens only when dbus handler calls d.errback which at the end of the script is os._exit(1).
To post a comment you must log in.
Revision history for this message
| John Lenton (chipaca) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
