← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/pack.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/pack.py
333
333
                # risk that the same unicode string has been encoded two
334
334
                # different ways.
335
335
                if name_tuple in all_names:
336
 
                    raise errors.DuplicateRecordNameError(name_tuple)
 
336
                    raise errors.DuplicateRecordNameError(name_tuple[0])
337
337
                all_names.add(name_tuple)
338
338
        excess_bytes = self.reader_func(1)
339
339
        if excess_bytes != '':