← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/protocol.py

  • Committer: Ian Clatworthy
  • Date: 2007-10-25 08:24:09 UTC
  • mto: (2941.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2942.
  • Revision ID: ian.clatworthy@internode.on.net-20071025082409-c42zo7ut3mov9ihl
Review feedback from poolie and spiv

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
401
401
            new_char = self._request.read_bytes(1)
402
402
            if new_char == '':
403
403
                # end of file encountered reading from server
404
 
                if len(line) == 0:
405
 
                    # disconnected before any data read
406
 
                    raise errors.ConnectionErrorOnStartUp(
407
 
                        "please check connectivity and permissions")
408
 
                else:
409
 
                    # disconnected after some data received
410
 
                    raise errors.ConnectionReset("connection timeout")
 
404
                raise errors.ConnectionReset(
 
405
                    "please check connectivity and permissions",
 
406
                    "(and try -Dhpss if further diagnosis is required)")
411
407
            line += new_char
412
408
        return line
413
409