~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.py

(jam) If _resume_write_group aborts,
        abort the write group that was just started.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2289
2289
 
2290
2290
    def _resume_write_group(self, tokens):
2291
2291
        self._start_write_group()
2292
 
        self._pack_collection._resume_write_group(tokens)
 
2292
        try:
 
2293
            self._pack_collection._resume_write_group(tokens)
 
2294
        except errors.UnresumableWriteGroup:
 
2295
            self._abort_write_group()
 
2296
            raise
2293
2297
        for pack in self._pack_collection._resumed_packs:
2294
2298
            self.revisions._index.scan_unvalidated_index(pack.revision_index)
2295
2299