Ubuntu One Client

Merge lp:~rye/ubuntuone-client/handle-dbus-errback-in-launcher-stable-1-4 into lp:ubuntuone-client/stable-1-4

  1. handle-dbus-errback-in-launcher-stable-1-4
  2. Merge into stable-1-4
Proposed by Roman Yepishev
Status: Merged
Approved by: Roman Yepishev
Approved revision: 731
Merged at revision: 733
Proposed branch: lp:~rye/ubuntuone-client/handle-dbus-errback-in-launcher-stable-1-4
Merge into: lp: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:~rye/ubuntuone-client/handle-dbus-errback-in-launcher-stable-1-4
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+37009@code.launchpad.net

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
1=== modified file 'bin/ubuntuone-launch'
2--- bin/ubuntuone-launch 2010-09-09 01:34:03 +0000
3+++ bin/ubuntuone-launch 2010-09-29 15:44:46 +0000
4@@ -99,7 +99,7 @@
5 try:
6 # have SD start
7 d = sync_daemon_tool.start()
8- d.addCallback(wait_for_ready, sync_daemon_tool)
9+ d.addBoth(wait_for_ready, sync_daemon_tool)
10 except dbus.exception.DBusException, e:
11 # some dbus error, shouldn't happen, bail out
12 d = defer.fail(e)

Subscribers

People subscribed via source and target branches