← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2011-08-02 01:10:27 UTC
  • mfrom: (6015.9.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6047.
  • Revision ID: mbp@canonical.com-20110802011027-cv8b6h9q18ctxle4
merge up 2.3 and 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
271
271
                        cur_offset_and_size = iter_offsets.next()
272
272
 
273
273
            except (errors.ShortReadvError, errors.InvalidRange,
274
 
                    errors.InvalidHttpRange), e:
 
274
                    errors.InvalidHttpRange, errors.HttpBoundaryMissing), e:
275
275
                mutter('Exception %r: %s during http._readv',e, e)
276
276
                if (not isinstance(e, errors.ShortReadvError)
277
277
                    or retried_offset == cur_offset_and_size):