| Message ID | 20250408172722.377963-1-bryan@schmersal.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Import CHECKADDRINUSE from errno and drop "errno." when it is referenced. Was causing an exception. | expand |
On 08/04/2025 6:27 pm, bryan@schmersal.org wrote: > From: Bryan Schmersal <bryan.schmersal@bossanova.com> > > --- > rpc/rpc.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) hi Bryan, thanks very much for this. Applied; tagged pynfs-0.4 In future, if you submit further patches, please remember to add a Signed-off-by: line. Also, it's normal to add a subsystem identifier to the description, e.g: [PATCH pynfs] … or: [PATCH] pynfs: … which makes it easier to keep track of things, especially on a list like linux-nfs that deals with multiple kernel subsystems, as well as other out-of-tree userland elements like pynfs. I've fixed up the above for this patch. Thanks again, much appreciated, best wishes, calum. > > diff --git a/rpc/rpc.py b/rpc/rpc.py > index 124e97a..84088f6 100644 > --- a/rpc/rpc.py > +++ b/rpc/rpc.py > @@ -6,7 +6,7 @@ import struct > import threading > import logging > from collections import deque as Deque > -from errno import EINPROGRESS, EWOULDBLOCK > +from errno import EINPROGRESS, EWOULDBLOCK, EADDRINUSE > > from . import rpc_pack > from .rpc_const import * > @@ -846,7 +846,7 @@ class ConnectionHandler(object): > s.bind(('', using)) > return > except OSError as why: > - if why.errno == errno.EADDRINUSE: > + if why.errno == EADDRINUSE: > using += 1 > if port < 1024 <= using: > # If we ask for a secure port, make sure we don't
diff --git a/rpc/rpc.py b/rpc/rpc.py index 124e97a..84088f6 100644 --- a/rpc/rpc.py +++ b/rpc/rpc.py @@ -6,7 +6,7 @@ import struct import threading import logging from collections import deque as Deque -from errno import EINPROGRESS, EWOULDBLOCK +from errno import EINPROGRESS, EWOULDBLOCK, EADDRINUSE from . import rpc_pack from .rpc_const import * @@ -846,7 +846,7 @@ class ConnectionHandler(object): s.bind(('', using)) return except OSError as why: - if why.errno == errno.EADDRINUSE: + if why.errno == EADDRINUSE: using += 1 if port < 1024 <= using: # If we ask for a secure port, make sure we don't
From: Bryan Schmersal <bryan.schmersal@bossanova.com> --- rpc/rpc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)