~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/hashcache.py

merge merge tweaks from aaron, which includes latest .dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
222
222
            inf = file(fn, 'rb', buffering=65000)
223
223
        except IOError, e:
224
224
            mutter("failed to open %s: %s" % (fn, e))
 
225
            # better write it now so it is valid
 
226
            self.needs_write = True
225
227
            return
226
228
 
227
229
 
229
231
        if hdr != CACHE_HEADER:
230
232
            mutter('cache header marker not found at top of %s; discarding cache'
231
233
                   % fn)
 
234
            self.needs_write = True
232
235
            return
233
236
 
234
237
        for l in inf: