[tsumufs commit] r435 - Integrating a bugfix for comparing appends to files from Bastien (megabast).

[codesite...@google.com]

Author: june.tate
Date: Thu Jun 4 10:14:03 2009
New Revision: 435

Modified:
trunk/lib/tsumufs/syncthread.py

Log:
Integrating a bugfix for comparing appends to files from Bastien (megabast).

Modified: trunk/lib/tsumufs/syncthread.py
==============================================================================
--- trunk/lib/tsumufs/syncthread.py (original)
+++ trunk/lib/tsumufs/syncthread.py Thu Jun 4 10:14:03 2009
@@ -182,6 +182,10 @@
data = tsumufs.nfsMount.readFileRegion(fusepath,
region.getStart(),

region.getEnd()-region.getStart())
+
+ if len(data) < region.getEnd() - region.getStart():
+ data += '\x00' * ((region.getEnd() - region.getStart()) -
len(data))
+
if region.getData() != data:
self._debug('Region has changed -- entire changeset conflicted.')
self._debug('Data read was %s' % repr(data))