Fix block updates. fixblocks
authorAntony Chazapis <chazapis@gmail.com>
Fri, 17 Feb 2012 11:32:50 +0000 (13:32 +0200)
committerAntony Chazapis <chazapis@gmail.com>
Fri, 17 Feb 2012 11:32:50 +0000 (13:32 +0200)
Refs #2038

pithos/api/util.py
pithos/backends/lib/hashfiler/blocker.py

index 9c1b4b1..a891a99 100644 (file)
@@ -610,7 +610,6 @@ class ObjectWrapper(object):
     """
     
     def __init__(self, backend, ranges, sizes, hashmaps, boundary):
-        print '***', ranges, sizes, hashmaps, boundary
         self.backend = backend
         self.ranges = ranges
         self.sizes = sizes
index b5ecb61..af64bfa 100644 (file)
@@ -164,8 +164,10 @@ class Blocker(object):
         
         block = block[0]
         newblock = block[:offset] + data
-        if len(block) >= blocksize:
+        if len(newblock) > blocksize:
             newblock = newblock[:blocksize]
+        elif len(newblock) < blocksize:
+            newblock += block[len(newblock):]
 
         h, a = self.block_stor((newblock,))
         return h[0], 1 if a else 0