← 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: Canonical.com Patch Queue Manager
  • Date: 2011-08-02 04:09:08 UTC
  • mfrom: (6046.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20110802040908-hqz2wr82nyrk14gk
(mbp) merge 2.3 and 2.4 to trunk (Martin Pool)

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):