diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3/deterministic_imports.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/deterministic_imports.patch | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/meta/recipes-devtools/python/python3/deterministic_imports.patch b/meta/recipes-devtools/python/python3/deterministic_imports.patch index 296b413cab..104df94964 100644 --- a/meta/recipes-devtools/python/python3/deterministic_imports.patch +++ b/meta/recipes-devtools/python/python3/deterministic_imports.patch | |||
@@ -1,3 +1,8 @@ | |||
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 | |||
1 | There are two issues here. Firstly, the modules are accessed in on disk order. This | 6 | There are two issues here. Firstly, the modules are accessed in on disk order. This |
2 | means behaviour seen on one system might not reproduce on another and is a real headache. | 7 | means behaviour seen on one system might not reproduce on another and is a real headache. |
3 | 8 | ||
@@ -9,12 +14,15 @@ As a result, patch this to a behaviour which works for us. | |||
9 | Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes] | 14 | Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes] |
10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
11 | 16 | ||
17 | --- | ||
18 | Lib/importlib/metadata/__init__.py | 9 ++++++++- | ||
19 | 1 file changed, 8 insertions(+), 1 deletion(-) | ||
12 | 20 | ||
13 | Index: Python-3.10.4/Lib/importlib/metadata/__init__.py | 21 | diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py |
14 | =================================================================== | 22 | index 82e0ce1..969cac4 100644 |
15 | --- Python-3.10.4.orig/Lib/importlib/metadata/__init__.py | 23 | --- a/Lib/importlib/metadata/__init__.py |
16 | +++ Python-3.10.4/Lib/importlib/metadata/__init__.py | 24 | +++ b/Lib/importlib/metadata/__init__.py |
17 | @@ -819,7 +819,14 @@ class Lookup: | 25 | @@ -710,7 +710,14 @@ class Lookup: |
18 | self.infos = FreezableDefaultDict(list) | 26 | self.infos = FreezableDefaultDict(list) |
19 | self.eggs = FreezableDefaultDict(list) | 27 | self.eggs = FreezableDefaultDict(list) |
20 | 28 | ||