equal
deleted
inserted
replaced
804 fp.close() |
804 fp.close() |
805 os.unlink(tempname) |
805 os.unlink(tempname) |
806 except error.BundleValueError, exc: |
806 except error.BundleValueError, exc: |
807 bundler = bundle2.bundle20(repo.ui) |
807 bundler = bundle2.bundle20(repo.ui) |
808 errpart = bundler.newpart('B2X:ERROR:UNSUPPORTEDCONTENT') |
808 errpart = bundler.newpart('B2X:ERROR:UNSUPPORTEDCONTENT') |
809 errpart.addparam('parttype', str(exc)) |
809 errpart.addparam('parttype', exc.parttype) |
810 return streamres(bundler.getchunks()) |
810 return streamres(bundler.getchunks()) |
811 except util.Abort, inst: |
811 except util.Abort, inst: |
812 # The old code we moved used sys.stderr directly. |
812 # The old code we moved used sys.stderr directly. |
813 # We did not change it to minimise code change. |
813 # We did not change it to minimise code change. |
814 # This need to be moved to something proper. |
814 # This need to be moved to something proper. |