From 0291c2c1314d0691a1960d5e991c67c7a00304d1 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 15 Mar 2024 14:37:49 +0000 Subject: python3_pip517: just count wheels in the directory, not subdirectories 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. (From OE-Core rev: 0142da4768b7818b94601a89bf867e10a0ba0ec0) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes-recipe/python_pep517.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes-recipe') diff --git a/meta/classes-recipe/python_pep517.bbclass b/meta/classes-recipe/python_pep517.bbclass index a1659c5f62..c30674c8ec 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 -- cgit v1.2.3-54-g00ecf