##// END OF EJS Templates
wireproto: fix lingering str(exception) with util.forcebytestr(exception)...
Augie Fackler -
r36332:be9c497e default
parent child Browse files
Show More
@@ -927,7 +927,7 b' def lookup(repo, proto, key):'
927 r = c.hex()
927 r = c.hex()
928 success = 1
928 success = 1
929 except Exception as inst:
929 except Exception as inst:
930 r = str(inst)
930 r = util.forcebytestr(inst)
931 success = 0
931 success = 0
932 return bytesresponse('%d %s\n' % (success, r))
932 return bytesresponse('%d %s\n' % (success, r))
933
933
@@ -1055,12 +1055,13 b' def unbundle(repo, proto, heads):'
1055 if exc.params:
1055 if exc.params:
1056 errpart.addparam('params', '\0'.join(exc.params))
1056 errpart.addparam('params', '\0'.join(exc.params))
1057 except error.Abort as exc:
1057 except error.Abort as exc:
1058 manargs = [('message', str(exc))]
1058 manargs = [('message', util.forcebytestr(exc))]
1059 advargs = []
1059 advargs = []
1060 if exc.hint is not None:
1060 if exc.hint is not None:
1061 advargs.append(('hint', exc.hint))
1061 advargs.append(('hint', exc.hint))
1062 bundler.addpart(bundle2.bundlepart('error:abort',
1062 bundler.addpart(bundle2.bundlepart('error:abort',
1063 manargs, advargs))
1063 manargs, advargs))
1064 except error.PushRaced as exc:
1064 except error.PushRaced as exc:
1065 bundler.newpart('error:pushraced', [('message', str(exc))])
1065 bundler.newpart('error:pushraced',
1066 [('message', util.forcebytestr(exc))])
1066 return streamres_legacy(gen=bundler.getchunks())
1067 return streamres_legacy(gen=bundler.getchunks())
General Comments 0
You need to be logged in to leave comments. Login now