~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/pack.py

  • Committer: Martin Pool
  • Date: 2010-02-25 06:17:27 UTC
  • mfrom: (5055 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5057.
  • Revision ID: mbp@sourcefrog.net-20100225061727-4sd9lt0qmdc6087t
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
203
203
        result = self._string.readline()
204
204
        if self._string.tell() == self._string_length and result[-1] != '\n':
205
205
            raise errors.BzrError('short readline in the readvfile hunk: %r'
206
 
                % (result, ))
 
206
                % (readline, ))
207
207
        return result
208
208
 
209
209
 
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[0])
 
336
                    raise errors.DuplicateRecordNameError(name_tuple)
337
337
                all_names.add(name_tuple)
338
338
        excess_bytes = self.reader_func(1)
339
339
        if excess_bytes != '':