mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01: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>
40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
From 0a02e3b85176a5ce4dd98830bb65dac8596142e9 Mon Sep 17 00:00:00 2001
|
|
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Date: Fri, 27 May 2022 17:05:44 +0100
|
|
Subject: [PATCH] python3: Ensure stale empty python module directories don't
|
|
|
|
There are two issues here. Firstly, the modules are accessed in on disk order. This
|
|
means behaviour seen on one system might not reproduce on another and is a real headache.
|
|
|
|
Secondly, empty directories left behind by previous modules might be looked at. This
|
|
has caused a long string of different issues for us.
|
|
|
|
As a result, patch this to a behaviour which works for us.
|
|
|
|
Upstream-Status: Submitted [https://github.com/python/cpython/issues/120492; need to first talk to upstream to see if they'll take one or both fixes]
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
---
|
|
Lib/importlib/metadata/__init__.py | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
|
|
index 8ce62dd..a6ea6e9 100644
|
|
--- a/Lib/importlib/metadata/__init__.py
|
|
+++ b/Lib/importlib/metadata/__init__.py
|
|
@@ -786,7 +786,14 @@ class Lookup:
|
|
self.infos = FreezableDefaultDict(list)
|
|
self.eggs = FreezableDefaultDict(list)
|
|
|
|
- for child in path.children():
|
|
+ for child in sorted(path.children()):
|
|
+ childpath = pathlib.Path(path.root, child)
|
|
+ try:
|
|
+ if childpath.is_dir() and not any(childpath.iterdir()):
|
|
+ # Empty directories aren't interesting
|
|
+ continue
|
|
+ except PermissionError:
|
|
+ continue
|
|
low = child.lower()
|
|
if low.endswith((".dist-info", ".egg-info")):
|
|
# rpartition is faster than splitext and suitable for this purpose.
|