do_bloom(): remove unused "count" variable

[bup.git] / lib / bup / index.py

diff --git a/lib/bup/index.py b/lib/bup/index.py
index 09a3e628c8de9ee7d9d561ea7f3274d9f6ae525f..794ff9f344393a9238883abe0aaf932c88399647 100644 (file)
--- a/lib/bup/index.py
+++ b/lib/bup/index.py
@@ -30,6 +30,7 @@ class Error(Exception):
 
 class MetaStoreReader:
     def __init__(self, filename):
+        self._file = None
         self._file = open(filename, 'rb')
 
     def close(self):
@@ -53,6 +54,7 @@ class MetaStoreWriter:
         # Map metadata hashes to bupindex.meta offsets.
         self._offsets = {}
         self._filename = filename
+        self._file = None
         # FIXME: see how slow this is; does it matter?
         m_file = open(filename, 'ab+')
         try:
@@ -489,8 +491,8 @@ class Writer:
     def _add(self, ename, entry):
         if self.lastfile and self.lastfile <= ename:
             raise Error('%r must come before %r' 
-                             % (''.join(e.name), ''.join(self.lastfile)))
-            self.lastfile = e.name
+                             % (''.join(ename), ''.join(self.lastfile)))
+        self.lastfile = ename
         self.level = _golevel(self.level, self.f, ename, entry,
                               self.metastore, self.tmax)
 
@@ -518,7 +520,7 @@ class Writer:
         else:
             assert(endswith)
             meta_ofs = self.metastore.store(metadata.Metadata())
-            e = BlankNewEntry(basename, meta_ofs, tmax)
+            e = BlankNewEntry(basename, meta_ofs, self.tmax)
             e.gitmode = gitmode
             e.sha = sha
             e.flags = flags