Merge lp:~mikemc/ubuntuone-client/fix-default-fs-monitor into lp:ubuntuone-client

[Mike McCracken]

- Make fsevents root daemon the default fs monitor for darwin, leave other platforms alone.

- Make fsevents root daemon the default fs monitor for darwin, leave other platforms alone.

In the correct way this time, by naming it 'default' and naming the other one something else, and leaving the syncdaemon.conf alone, so it won't break other platforms.

For completeness, I note that I did it the wrong way previously, in this branch: lp:~mikemc/ubuntuone-client/fsevents-daemon-default

[Roberto Alsina (ralsina)]

+1 checked that it doesn't break ubuntu

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'ubuntuone/platform/filesystem_notifications/monitor/__init__.py'
--- ubuntuone/platform/filesystem_notifications/monitor/__init__.py	2012-08-28 07:58:50 +0000
+++ ubuntuone/platform/filesystem_notifications/monitor/__init__.py	2012-09-19 17:44:12 +0000
@@ -60,8 +60,8 @@
     )
 
     FILEMONITOR_IDS = {
-        DEFAULT_MONITOR: common.FilesystemMonitor,
-        'daemon': darwin.fsevents_daemon.FilesystemMonitor,
+        DEFAULT_MONITOR: darwin.fsevents_daemon.FilesystemMonitor,
+        'macfsevents': common.FilesystemMonitor,
     }
     ACTIONS = darwin.fsevents_client.ACTIONS
 else: