Merge lp://staging/~dobey/ubuntuone-client/better-noconnect into lp://staging/ubuntuone-client

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 1408
Merged at revision: 1405
Proposed branch: lp://staging/~dobey/ubuntuone-client/better-noconnect
Merge into: lp://staging/ubuntuone-client
Diff against target: 139 lines (+51/-53)
2 files modified
ubuntuone/syncdaemon/ (+6/-0)
ubuntuone/syncdaemon/ (+45/-53)
To merge this branch: bzr merge lp://staging/~dobey/ubuntuone-client/better-noconnect
Reviewer Review Type Date Requested Status
Facundo Batista (community) Approve
Review via email:

Commit message

Move the date check into the connect method.

Description of the change

This reverts the changes to from the previous revision, and moves the date check to the connect() method. The previous change does not actually cause the process to exit and results in any code using the DBus API hanging around waiting for the request to time out, for a very long time. Instead, we just always block connections, and allow the syncdaemon to start normally otherwise, so that ubuntuone-control-panel, u1sdtool, and Nautilus will continue working normally without problems (outside of the intent of never connecting to the server and not synchronizing files).

To post a comment you must log in.
1407. By dobey

Need to import datetime here.

1408. By dobey

Fix the logic in the date check.

Revision history for this message
Facundo Batista (facundo) wrote :


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.


People subscribed via source and target branches