mirror of
https://git.yoctoproject.org/poky
synced 2026-01-31 05:48:43 +01:00
64ac9fa408
(From OE-Core rev: eb3868d99ef2d5fa9fafc9cf947209d81ab5f11f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d77511cc9add70857e4a9d7237b23d7d6ae14e98) Signed-off-by: Steve Sakoman <steve@sakoman.com>
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
From 039d5e652796b55f1132afa568c7432b6ed89afd 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 82e0ce1..969cac4 100644
|
|
--- a/Lib/importlib/metadata/__init__.py
|
|
+++ b/Lib/importlib/metadata/__init__.py
|
|
@@ -710,7 +710,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.
|