← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v4.py
131
131
        """
132
132
        name = self.encode_name(repo_kind, revision_id, file_id)
133
133
        encoded_metadata = bencode.bencode(metadata)
134
 
        self._container.add_bytes_record(encoded_metadata, [name])
 
134
        self._container.add_bytes_record(encoded_metadata, [(name, )])
135
135
        if metadata['storage_kind'] != 'header':
136
136
            self._container.add_bytes_record(bytes, [])
137
137
 
200
200
            else:
201
201
                _unused, bytes = iterator.next()
202
202
                bytes = bytes(None)
203
 
            yield (bytes, metadata) + self.decode_name(names[0])
 
203
            yield (bytes, metadata) + self.decode_name(names[0][0])
204
204
 
205
205
 
206
206
class BundleSerializerV4(serializer.BundleSerializer):