← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/ubuntuone-client/oneiric

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/volume_manager.py

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2011-02-23 18:34:09 UTC
  • mfrom: (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110223183409-535o7yo165wbjmca
Tags: 1.5.5-0ubuntu1
https://launchpad.net/bugs/712528
https://launchpad.net/bugs/714976
https://launchpad.net/bugs/702116
https://launchpad.net/bugs/715887
* New upstream release.
  - Subscribing to a RO share will not download content (LP: #712528)
  - Can't synchronize "~/Ubuntu One Music" (LP: #714976)
  - Syncdaemon needs to show progress in Unity launcher (LP: #702116)
  - Notifications say "your cloud" (LP: #715887)
  - No longer requires python-libproxy
  - Recommend unity and indicator libs by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/volume_manager.py
1243
1243
            self.store_volume(volume)
1244
1244
            return result
1245
1245
 
1246
 
        if volume.can_write():
1247
 
            try:
1248
 
                d = self._scan_volume(volume)
1249
 
            except KeyError, e:
1250
 
                push_error(error="METADATA_DOES_NOT_EXIST")
1251
 
                return defer.fail(e)
1252
 
        else:
1253
 
            # avoid local and server rescan for read-only volumes
1254
 
            d = defer.succeed(None)
 
1246
        try:
 
1247
            d = self._scan_volume(volume, scan_local=volume.can_write())
 
1248
        except KeyError, e:
 
1249
            push_error(error="METADATA_DOES_NOT_EXIST")
 
1250
            return defer.fail(e)
1255
1251
 
1256
1252
        def handle_failure(failure):
1257
1253
            """Push error and propagate the failure."""