mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
085afc322b
License-update: copyright years Update 0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch to only include tests that do not fail under qemu (following upstream change that also no longer obscures failures). Drop 0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch (backport) 0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch (fixed upstream) 0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch (code completely rewritten upstream) cgi_py.patch (cgi and cgitb modules removed upstream) Add fix-armv5.patch (address armv5 crashes) Modules removed in 3.13 (look for 'important removals'): https://docs.python.org/3/whatsnew/3.13.html Manifest updated accordingly. Add an explicit dependency on libatomic (needed on mips and ppc), as upstream has explicitly switched it off in cross builds. It's a no-op on other targets. Fcntl relocated to python3-core by the manifest script. (From OE-Core rev: 0b49c9aa31279ecda565cc66b63d1d61723b37b8) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 129ee75863081d9e3418acca3df1e47667f671ad Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex@linutronix.de>
|
|
Date: Thu, 16 Sep 2021 16:35:37 +0200
|
|
Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O
|
|
errors
|
|
|
|
reading stdin can throw the same I/O errors as reading from master fd does,
|
|
e.g. when running under Yocto's test harness:
|
|
======================================================================
|
|
ERROR: test_spawn_doesnt_hang (test.test_pty.PtyTest)
|
|
----------------------------------------------------------------------
|
|
Traceback (most recent call last):
|
|
File "/usr/lib/python3.10/test/test_pty.py", line 316, in test_spawn_doesnt_hang
|
|
pty.spawn([sys.executable, '-c', 'print("hi there")'])
|
|
File "/usr/lib/python3.10/pty.py", line 181, in spawn
|
|
_copy(master_fd, master_read, stdin_read)
|
|
File "/usr/lib/python3.10/pty.py", line 157, in _copy
|
|
data = stdin_read(STDIN_FILENO)
|
|
File "/usr/lib/python3.10/pty.py", line 132, in _read
|
|
return os.read(fd, 1024)
|
|
OSError: [Errno 5] Input/output error
|
|
|
|
So let's treat both channels the same.
|
|
|
|
Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388]
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
---
|
|
Lib/pty.py | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Lib/pty.py b/Lib/pty.py
|
|
index 1d97994..fa8821b 100644
|
|
--- a/Lib/pty.py
|
|
+++ b/Lib/pty.py
|
|
@@ -178,7 +178,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
|
|
i_buf = i_buf[n:]
|
|
|
|
if stdin_avail and STDIN_FILENO in rfds:
|
|
- data = stdin_read(STDIN_FILENO)
|
|
+ try:
|
|
+ data = stdin_read(STDIN_FILENO)
|
|
+ except OSError:
|
|
+ data = b""
|
|
if not data:
|
|
stdin_avail = False
|
|
else:
|