← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-08-17 17:49:34 UTC
  • mfrom: (2520.6.5 bundle-fix)
  • Revision ID: pqm@pqm.ubuntu.com-20070817174934-5094ol577uv7ys4u
Fix bundle installation wrong-versionedfile bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v4.py
479
479
            if repo_kind == 'info':
480
480
                assert self._info is None
481
481
                self._handle_info(metadata)
482
 
            if ((repo_kind, file_id) != ('file', current_file) and
483
 
                len(pending_file_records) > 0):
484
 
                self._install_mp_records(current_versionedfile,
485
 
                    pending_file_records)
 
482
            if (repo_kind, file_id) != ('file', current_file):
 
483
                if len(pending_file_records) > 0:
 
484
                    self._install_mp_records(current_versionedfile,
 
485
                                             pending_file_records)
486
486
                current_file = None
487
487
                current_versionedfile = None
488
488
                pending_file_records = []