← Back to branch summary

~verterok/ubuntuone-client/fix-692496-stable-1-4

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/volume_manager.py

  • Committer: Tarmac
  • Author(s): guillermo.gonzalez at canonical
  • Date: 2010-12-07 15:10:14 UTC
  • mfrom: (738.2.1 fix-674092-stable-1-4)
  • Revision ID: tarmac-20101207151014-hrhs059oje8vabw6
Fix server rescan to also cleanup dead volumes after the actual volumes rescan.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/volume_manager.py
481
481
        """Do the 'server rescan'"""
482
482
        d = self.m.action_q.query_volumes()
483
483
        d.addCallback(self._volumes_rescan_cb)
 
484
        def cleanup(result):
 
485
            shares, udfs = result
 
486
            self._cleanup_volumes(shares=shares, udfs=udfs)
 
487
        d.addCallbacks(cleanup)
484
488
        def done(_):
485
489
            self.m.event_q.push('SYS_SERVER_RESCAN_DONE')
486
490
        def error(failure):