diff mbox series

[1/3] python3_pip517: just count wheels in the directory, not subdirectories

Message ID 20240315143751.1235135-1-ross.burton@arm.com
State Accepted, archived
Commit 0142da4768b7818b94601a89bf867e10a0ba0ec0
Headers show
Series [1/3] python3_pip517: just count wheels in the directory, not subdirectories | expand

Commit Message

Ross Burton March 15, 2024, 2:37 p.m. UTC 
From: Ross Burton <ross.burton@arm.com>

The install task uses a recursive find to check that it can only find
one wheel, but then does a non-recursive glob to install.  This can
lead to false-failures if PEP517_WHEEL_PATH points at a directory with
subdirectories.

Solve this mismatch by making the find non-recusive.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/classes-recipe/python_pep517.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/python_pep517.bbclass b/meta/classes-recipe/python_pep517.bbclass
index a1659c5f628..c30674c8ec8 100644
--- a/meta/classes-recipe/python_pep517.bbclass
+++ b/meta/classes-recipe/python_pep517.bbclass
@@ -42,7 +42,7 @@  python_pep517_do_compile () {
 do_compile[cleandirs] += "${PEP517_WHEEL_PATH}"
 
 python_pep517_do_install () {
-    COUNT=$(find ${PEP517_WHEEL_PATH} -name '*.whl' | wc -l)
+    COUNT=$(find ${PEP517_WHEEL_PATH} -name '*.whl' -maxdepth 1 | wc -l)
     if test $COUNT -eq 0; then
         bbfatal No wheels found in ${PEP517_WHEEL_PATH}
     elif test $COUNT -gt 1; then