Mercurial > hg-stable
changeset 39097:ed8160e4fea0
util: fix signature of setsockopt in socket observer
The format string expected the result, callers all passed the result,
but we didn't actually accept the result to this function. I swear
I've looked at this code a dozen times trying to find the problem, and
it was this simple all along.
Differential Revision: https://phab.mercurial-scm.org/D4253
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 10 Aug 2018 02:30:14 -0400 |
| parents | 2e37bd614879 |
| children | b3c6c194f33a |
| files | mercurial/util.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/util.py Fri Aug 10 02:03:26 2018 -0400 +++ b/mercurial/util.py Fri Aug 10 02:30:14 2018 -0400 @@ -948,12 +948,12 @@ self.fh.write('%s> gettimeout() -> %f\n' % (self.name, res)) - def setsockopt(self, level, optname, value): + def setsockopt(self, res, level, optname, value): if not self.states: return self.fh.write('%s> setsockopt(%r, %r, %r) -> %r\n' % ( - self.name, level, optname, value)) + self.name, level, optname, value, res)) def makeloggingsocket(logh, fh, name, reads=True, writes=True, states=True, logdata=False, logdataapis=True):