~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-08-01 08:36:29 UTC
mfrom: (6015.11.1 integration-2.4)
mto: (6046.1.1 integration) (6015.14.1 bzr24-filter-809901) (6060.2.1 trunk) (6069.1.1 trunk) (6082.5.1 expand-in-stack) (6089.1.1 trunk) (6090.1.1 trunk) (6092.1.1 810701-lang-not-set) (6093.1.1 trunk) (6104.1.1 2.5-get_cached_parent_map-388269) (6123.1.6 +trunk) (6169.2.2 overflow_pack_stat_683191_706957) (6133.1.1 trunk) (6165.1.1 trunk) (6191.1.1 trunk) (6201.1.1 dev_2.4_integration) (6205.1.1 2.4-into-2.5) (6206.1.1 2.5-client-reconnect-819604) (6232.1.1 dev_2.4_integration) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev)
mto: This revision was merged to the branch mainline in revision 6047.
Revision ID: pqm@pqm.ubuntu.com-20110801083629-01vbiolx4vyww001

(mbp) merge up fix for bug 198646 from bzr.2.3

added added

removed removed

271

cur_offset_and_size = iter_offsets.next()

272

273

except (errors.ShortReadvError, errors.InvalidRange,

274

errors.InvalidHttpRange), e:

274

errors.InvalidHttpRange, errors.HttpBoundaryMissing), e:

275

mutter('Exception %r: %s during http._readv',e, e)

276

if (not isinstance(e, errors.ShortReadvError)

277

or retried_offset == cur_offset_and_size):