Patrick Williams | 56b44a9 | 2024-01-19 08:49:29 -0600 | [diff] [blame] | 1 | From 039d5e652796b55f1132afa568c7432b6ed89afd Mon Sep 17 00:00:00 2001 |
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Fri, 27 May 2022 17:05:44 +0100 |
| 4 | Subject: [PATCH] python3: Ensure stale empty python module directories don't |
| 5 | |
Andrew Geissler | 78b7279 | 2022-06-14 06:47:25 -0500 | [diff] [blame] | 6 | There are two issues here. Firstly, the modules are accessed in on disk order. This |
| 7 | means behaviour seen on one system might not reproduce on another and is a real headache. |
| 8 | |
| 9 | Secondly, empty directories left behind by previous modules might be looked at. This |
| 10 | has caused a long string of different issues for us. |
| 11 | |
| 12 | As a result, patch this to a behaviour which works for us. |
| 13 | |
| 14 | Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes] |
| 15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 16 | |
Patrick Williams | 56b44a9 | 2024-01-19 08:49:29 -0600 | [diff] [blame] | 17 | --- |
| 18 | Lib/importlib/metadata/__init__.py | 9 ++++++++- |
| 19 | 1 file changed, 8 insertions(+), 1 deletion(-) |
Andrew Geissler | 78b7279 | 2022-06-14 06:47:25 -0500 | [diff] [blame] | 20 | |
Patrick Williams | 56b44a9 | 2024-01-19 08:49:29 -0600 | [diff] [blame] | 21 | diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py |
| 22 | index 82e0ce1..969cac4 100644 |
| 23 | --- a/Lib/importlib/metadata/__init__.py |
| 24 | +++ b/Lib/importlib/metadata/__init__.py |
| 25 | @@ -710,7 +710,14 @@ class Lookup: |
Andrew Geissler | 78b7279 | 2022-06-14 06:47:25 -0500 | [diff] [blame] | 26 | self.infos = FreezableDefaultDict(list) |
| 27 | self.eggs = FreezableDefaultDict(list) |
| 28 | |
| 29 | - for child in path.children(): |
| 30 | + for child in sorted(path.children()): |
| 31 | + childpath = pathlib.Path(path.root, child) |
| 32 | + try: |
| 33 | + if childpath.is_dir() and not any(childpath.iterdir()): |
| 34 | + # Empty directories aren't interesting |
| 35 | + continue |
| 36 | + except PermissionError: |
| 37 | + continue |
| 38 | low = child.lower() |
| 39 | if low.endswith((".dist-info", ".egg-info")): |
| 40 | # rpartition is faster than splitext and suitable for this purpose. |