~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-01-05 01:54:01 UTC
  • mfrom: (3163.1.3 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20080105015401-67wgbytv81394cl1
RepositoryPackCollection._abort_write_group should check it actually has a new pack before aborting (#180208)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1648
1648
    def _abort_write_group(self):
1649
1649
        # FIXME: just drop the transient index.
1650
1650
        # forget what names there are
1651
 
        self._new_pack.abort()
1652
 
        self._remove_pack_indices(self._new_pack)
1653
 
        self._new_pack = None
 
1651
        if self._new_pack is not None:
 
1652
            self._new_pack.abort()
 
1653
            self._remove_pack_indices(self._new_pack)
 
1654
            self._new_pack = None
1654
1655
        self.repo._text_knit = None
1655
1656
 
1656
1657
    def _commit_write_group(self):