Rev 3505: Don't join the lines of the index twice (TimeHorse, James Westby) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3505
revision-id:pqm at pqm.ubuntu.com-20080620002425-fthsmp2t0ftzxp6c
parent: pqm at pqm.ubuntu.com-20080619070027-3xv1vy81m3ix2oup
parent: ian.clatworthy at canonical.com-20080619235828-ih9r1gj5np1vqwq7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-06-20 01:24:25 +0100
message:
  Don't join the lines of the index twice (TimeHorse, James Westby)
modified:
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
    ------------------------------------------------------------
    revno: 3504.1.1
    revision-id:ian.clatworthy at canonical.com-20080619235828-ih9r1gj5np1vqwq7
    parent: pqm at pqm.ubuntu.com-20080619070027-3xv1vy81m3ix2oup
    parent: jw+debian at jameswestby.net-20080617093208-qc53mh27wi3o6snn
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Fri 2008-06-20 09:58:28 +1000
    message:
      Don't join the lines of the index twice (TimeHorse, James Westby)
    modified:
      bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
    ------------------------------------------------------------
    revno: 3498.1.1
    revision-id:jw+debian at jameswestby.net-20080617093208-qc53mh27wi3o6snn
    parent: pqm at pqm.ubuntu.com-20080617064715-bmm5fdshd3gzgyac
    committer: James Westby <jw+debian at jameswestby.net>
    branch nick: bzr.dev
    timestamp: Tue 2008-06-17 10:32:08 +0100
    message:
      Don't join the lines of the index twice.
    modified:
      bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py	2008-04-24 07:22:53 +0000
+++ b/bzrlib/index.py	2008-06-17 09:32:08 +0000
@@ -219,7 +219,7 @@
             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
 
 
 class GraphIndex(object):