Show More
@@ -323,13 +323,19 b' def processbundle(repo, unbundler, trans' | |||||
323 | data=output) |
|
323 | data=output) | |
324 | op.reply.addpart(outpart) |
|
324 | op.reply.addpart(outpart) | |
325 | part.read() |
|
325 | part.read() | |
326 | except Exception: |
|
326 | except Exception, exc: | |
327 | if part is not None: |
|
327 | if part is not None: | |
328 | # consume the bundle content |
|
328 | # consume the bundle content | |
329 | part.read() |
|
329 | part.read() | |
330 | for part in iterparts: |
|
330 | for part in iterparts: | |
331 | # consume the bundle content |
|
331 | # consume the bundle content | |
332 | part.read() |
|
332 | part.read() | |
|
333 | # Small hack to let caller code distinguish exceptions from bundle2 | |||
|
334 | # processing fron the ones from bundle1 processing. This is mostly | |||
|
335 | # needed to handle different return codes to unbundle according to the | |||
|
336 | # type of bundle. We should probably clean up or drop this return code | |||
|
337 | # craziness in a future version. | |||
|
338 | exc.duringunbundle2 = True | |||
333 | raise |
|
339 | raise | |
334 | return op |
|
340 | return op | |
335 |
|
341 |
General Comments 0
You need to be logged in to leave comments.
Login now