summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch')
-rw-r--r--meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch
index df5179e877..07c6aef9b9 100644
--- a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch
+++ b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch
@@ -1,4 +1,4 @@
1From 86061629f4a179e740a17e53dd2c98ab47af2fe2 Mon Sep 17 00:00:00 2001 1From 7b0a14e7320078ac891d415cab9b7568e3f52ad8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Thu, 16 Sep 2021 16:35:37 +0200 3Date: Thu, 16 Sep 2021 16:35:37 +0200
4Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O 4Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O
@@ -30,18 +30,18 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
30 1 file changed, 4 insertions(+), 1 deletion(-) 30 1 file changed, 4 insertions(+), 1 deletion(-)
31 31
32diff --git a/Lib/pty.py b/Lib/pty.py 32diff --git a/Lib/pty.py b/Lib/pty.py
33index 8d8ce40..35439c6 100644 33index fefb63a..4cef056 100644
34--- a/Lib/pty.py 34--- a/Lib/pty.py
35+++ b/Lib/pty.py 35+++ b/Lib/pty.py
36@@ -154,7 +154,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read): 36@@ -184,7 +184,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
37 os.write(STDOUT_FILENO, data) 37 i_buf = i_buf[n:]
38 38
39 if STDIN_FILENO in rfds: 39 if stdin_avail and STDIN_FILENO in rfds:
40- data = stdin_read(STDIN_FILENO) 40- data = stdin_read(STDIN_FILENO)
41+ try: 41+ try:
42+ data = stdin_read(STDIN_FILENO) 42+ data = stdin_read(STDIN_FILENO)
43+ except OSError: 43+ except OSError:
44+ data = b"" 44+ data = b""
45 if not data: 45 if not data:
46 fds.remove(STDIN_FILENO) 46 stdin_avail = False
47 else: 47 else: