← Back to branch summary

~didrocks/ubuntuone-client/use_result_var

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/hash_queue.py

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2011-02-11 16:18:11 UTC
  • mto: This revision was merged to the branch mainline in revision 67.
  • Revision ID: james.westby@ubuntu.com-20110211161811-n18dj9lde7dxqjzr
Tags: upstream-1.5.4
Import upstream version 1.5.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/hash_queue.py
76
76
            except (IOError, OSError), e:
77
77
                m = "Hasher: hash error %s  (path %r  mdid %s)"
78
78
                self.logger.debug(m, e, path, mdid)
79
 
                reactor.callFromThread(self.eq.push, "HQ_HASH_ERROR", mdid)
 
79
                reactor.callFromThread(self.eq.push,
 
80
                                       "HQ_HASH_ERROR", mdid=mdid)
80
81
            except StopHashing, e:
81
82
                self.logger.debug(str(e))
82
83
            else:
85
86
                                  "  crc=%s  size=%d  st_ino=%d  st_size=%d"
86
87
                                  "  st_mtime=%r", path, hashdata,crc, size,
87
88
                                  stat.st_ino, stat.st_size, stat.st_mtime)
88
 
                reactor.callFromThread(self.eq.push,
89
 
                                       "HQ_HASH_NEW", path, *result)
 
89
                reactor.callFromThread(self.eq.push, "HQ_HASH_NEW", path=path,
 
90
                                                     hash=hashdata, crc32=crc,
 
91
                                                     size=size, stat=stat)
90
92
            finally:
91
93
                with self.mutex:
92
94
                    self.hashing = None