Ubuntu One Client

Merge lp:~facundo/ubuntuone-client/avoid-double-watch into lp:ubuntuone-client

  1. avoid-double-watch
  2. Merge into trunk
Proposed by Facundo Batista
Status: Merged
Approved by: Facundo Batista
Approved revision: 1015
Merged at revision: 1014
Proposed branch: lp:~facundo/ubuntuone-client/avoid-double-watch
Merge into: lp:ubuntuone-client
Diff against target: 11 lines (+0/-1)
1 file modified
ubuntuone/syncdaemon/main.py (+0/-1)
To merge this branch: bzr merge lp:~facundo/ubuntuone-client/avoid-double-watch
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
dobey (community) Approve
Review via email: mp+65661@code.launchpad.net

Commit message

Avoid double watch on 'Ubuntu One' directory (LP: #798979).

Description of the change

Avoid double watch on 'Ubuntu One' directory.

Just removed an add_watch() that was lost in main.py... this should have been removed a while ago, when VM took these responsibilities (but never surfaced, as it wasn't dangerous... until pyinotify changed behaviour in Oneiric).

Test not included because it's just a removal of duplicated code.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/syncdaemon/main.py'
2--- ubuntuone/syncdaemon/main.py 2011-06-15 19:53:56 +0000
3+++ ubuntuone/syncdaemon/main.py 2011-06-23 13:20:29 +0000
4@@ -200,7 +200,6 @@
5 """Setup the daemon to be ready to run."""
6 # hook the event queue to the root dir
7 self.event_q.push('SYS_INIT_DONE')
8- self.event_q.add_watch(self.root_dir)
9
10 def shutdown(self, with_restart=False):
11 """Shutdown the daemon; optionally restart it."""

Subscribers

People subscribed via source and target branches