← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/hashcache.py

[merge] robertc's integration, updated tests to check for retcode=3

Show diffs side-by-side

added added

removed removed

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