/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/bzr/knitpack_repo.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
690
690
            for result in self._do_copy_nodes_graph(index_map, writer,
691
691
                write_index, output_lines, pb, readv_group_iter, total_items):
692
692
                yield result
693
 
        except Exception:
694
 
            # Python 2.4 does not permit try:finally: in a generator.
695
 
            pb.finished()
696
 
            raise
697
 
        else:
 
693
        finally:
698
694
            pb.finished()
699
695
 
700
696
    def _do_copy_nodes_graph(self, index_map, writer, write_index,