/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to object_store.py

https://launchpad.net/bugs/552881
Catch KeyError from lookup_tree as well - some caches (such as sqlite) don't store all trees, only some.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
170
170
                        try:
171
171
                            shamap[ie.file_id] = pinvshamap.lookup_tree(
172
172
                                ie.file_id)
173
 
                        except NotImplementedError:
 
173
                        except (NotImplementedError, KeyError):
174
174
                            pass
175
175
                        else:
176
176
                            break
363
363
            if entry.kind == "directory":
364
364
                try:
365
365
                    return invshamap.lookup_tree(entry.file_id)
366
 
                except NotImplementedError:
 
366
                except (NotImplementedError, KeyError):
367
367
                    obj = self._get_tree(entry.file_id, revid, inv,
368
368
                        unusual_modes)
369
369
                    if obj is None: