[Pkg-bazaar-commits] ./bzr/unstable r131: check size and sha1 of files retrieved from the tree

[mbp at sourcefrog.net]

------------------------------------------------------------
revno: 131
committer: mbp at sourcefrog.net
timestamp: Tue 2005-03-29 12:31:34 +1000
message:
  check size and sha1 of files retrieved from the tree
modified:
  bzrlib/osutils.py
  bzrlib/tree.py
-------------- next part --------------
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2005-03-29 00:35:00 +0000
+++ b/bzrlib/osutils.py	2005-03-29 02:31:34 +0000
@@ -123,7 +123,6 @@
     b = f.read()
     s.update(b)
     size = len(b)
-    f.close()
     return {'size': size,
             'sha1': s.hexdigest()}
 

=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py	2005-03-29 01:26:19 +0000
+++ b/bzrlib/tree.py	2005-03-29 02:31:34 +0000
@@ -77,7 +77,7 @@
         f.seek(0)
         
         if ie.text_size is not None:
-            if fs != fp['size']:
+            if ie.text_size != fp['size']:
                 bailout("mismatched size for file %r in %r" % (ie.file_id, self._store),
                         ["inventory expects %d bytes" % ie.text_size,
                          "file is actually %d bytes" % fp['size'],
@@ -314,7 +314,7 @@
         ie = self._inventory[file_id]
         f = self._store[ie.text_id]
         mutter("  get fileid{%s} from %r" % (file_id, self))
-        ## self._check_retrieved(ie, f)
+        self._check_retrieved(ie, f)
         return f
 
     def get_file_size(self, file_id):