[MERGE] Don't join the lines of the index twice.

[Robert Collins]

On Tue, 2008-06-17 at 10:36 +0100, James Westby wrote:
> Hi,
> 
> I think this is correct. Here's the diff with extra
> context to make it clearer.
> 
> === modified file 'bzrlib/index.py'
> --- bzrlib/index.py	2008-04-24 07:22:53 +0000
> +++ bzrlib/index.py	2008-06-17 09:31:14 +0000
> @@ -217,11 +217,11 @@
>          result = StringIO(''.join(lines))
>          if expected_bytes and len(result.getvalue()) != expected_bytes:
>              raise errors.BzrError('Failed index creation. Internal
> error:'
>                  ' mismatched output length and expected length: %d %d'
> %
>                  (len(result.getvalue()), expected_bytes))
> -        return StringIO(''.join(lines))
> +        return result

bb:approve, clear bug.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080617/9f712f6f/attachment.pgp