← Back to branch summary

~didrocks/ubuntuone-client/use_result_var

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/local_rescan.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/local_rescan.py
354
354
        """Resume an interrupted upload."""
355
355
        mdobj = self.fsm.get_by_path(fullname)
356
356
        fh_factory = lambda: self.fsm.open_file(mdobj.mdid)
 
357
        upload_id = getattr(mdobj, 'upload_id', None)
357
358
        self.aq.upload(mdobj.share_id, mdobj.node_id, mdobj.server_hash,
358
359
                       mdobj.local_hash, mdobj.crc32, mdobj.size,
359
 
                       fullname, fh_factory)
 
360
                       fullname, fh_factory, upload_id=upload_id)
360
361
 
361
362
    def check_stat(self, fullname, oldstat):
362
363
        """Check stat info and return if different.