← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge a recent bzr.dev (2172) and takes John's remarks into account.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_pycurl.py
253
253
                        _pycurl_errors.CURLE_COULDNT_RESOLVE_PROXY):
254
254
                raise ConnectionError('curl connection error (%s)\non %s'
255
255
                              % (e[1], url))
 
256
            elif e[0] == _pycurl_errors.CURLE_PARTIAL_FILE:
 
257
                # Pycurl itself have detected a short read, we do
 
258
                # not have all the informations for the
 
259
                # ShortReadvError, but that should be enough
 
260
                raise errors.ShortReadvError(url,
 
261
                                             offset='unknown', length='unknown',
 
262
                                             actual='unknown',
 
263
                                             extra='Server aborted the request')
256
264
            # jam 20060713 The code didn't use to re-raise the exception here
257
265
            # but that seemed bogus
258
266
            raise