diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3/deterministic_imports.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/deterministic_imports.patch | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/meta/recipes-devtools/python/python3/deterministic_imports.patch b/meta/recipes-devtools/python/python3/deterministic_imports.patch index 296b413cab..2de6ae2e98 100644 --- a/meta/recipes-devtools/python/python3/deterministic_imports.patch +++ b/meta/recipes-devtools/python/python3/deterministic_imports.patch @@ -1,3 +1,8 @@ +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. @@ -6,15 +11,18 @@ has caused a long string of different issues for us. As a result, patch this to a behaviour which works for us. -Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes] +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(-) -Index: Python-3.10.4/Lib/importlib/metadata/__init__.py -=================================================================== ---- Python-3.10.4.orig/Lib/importlib/metadata/__init__.py -+++ Python-3.10.4/Lib/importlib/metadata/__init__.py -@@ -819,7 +819,14 @@ class Lookup: +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) |