~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-09-11 09:09:08 UTC
mfrom: (6437.74.5 2.5-conn-reset-socket-pipe-1047325)
mto: (6437.77.1 2.5) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6563.
Revision ID: pqm@pqm.ubuntu.com-20120911090908-1xx05ree9c58y4in

(jameinel) Treat socket.error(EPIPE) as a ConnectionReset (bug #1047325) so
that clients will properly reconnect. (John A Meinel)

added added

removed removed

910

except IOError, e:

911

if e.errno in (errno.EINVAL, errno.EPIPE):

912

raise errors.ConnectionReset(

913

"Error trying to write to subprocess:\n%s" % (e,))

913

"Error trying to write to subprocess", e)

914

raise

915

self._report_activity(len(bytes), 'write')

916

1043

1044

class SmartClientSocketMedium(SmartClientStreamMedium):

1045

"""A client medium using a socket.

1046

1047

This class isn't usable directly. Use one of its subclasses instead.

1048

"""

1049