← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_pycurl.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-20 05:12:03 UTC
  • mfrom: (4630.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090820051203-riyg1vh31w486hc6
(vila) Fix some more pycurl related karmic test failures

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_pycurl.py
92
92
CURLE_GOT_NOTHING = _get_pycurl_errcode('E_GOT_NOTHING', 52)
93
93
CURLE_PARTIAL_FILE = _get_pycurl_errcode('E_PARTIAL_FILE', 18)
94
94
CURLE_SEND_ERROR = _get_pycurl_errcode('E_SEND_ERROR', 55)
 
95
CURLE_RECV_ERROR = _get_pycurl_errcode('E_RECV_ERROR', 56)
95
96
CURLE_SSL_CACERT = _get_pycurl_errcode('E_SSL_CACERT', 60)
96
97
CURLE_SSL_CACERT_BADFILE = _get_pycurl_errcode('E_SSL_CACERT_BADFILE', 77)
97
98
 
367
368
                        ):
368
369
                raise errors.ConnectionError(
369
370
                    'curl connection error (%s)\non %s' % (e[1], url))
 
371
            elif e[0] == CURLE_RECV_ERROR:
 
372
                raise errors.ConnectionReset(
 
373
                    'curl connection error (%s)\non %s' % (e[1], url))
370
374
            elif e[0] == CURLE_PARTIAL_FILE:
371
375
                # Pycurl itself has detected a short read.  We do not have all
372
376
                # the information for the ShortReadvError, but that should be