From: Sam Kent <[email protected]> An empty runtime-provides directory caused lookup-recipe, package-info and list-pkg-files to skip the runtime-reverse fallback.
Use os.listdir() to ensure the folder is not empty and use os.path.isdir( to ensure it is not a file. Signed-off-by: Sam Kent <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit 678c1c2077316b6b81ba9be000528b50dca19ca6) Signed-off-by: Yoann Congal <[email protected]> --- scripts/oe-pkgdata-util | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index bbfc6a2dddd..904008bd029 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util @@ -289,8 +289,9 @@ def lookup_recipe(args): for pkg in pkgs: providepkgpath = os.path.join(args.pkgdata_dir, "runtime-rprovides", pkg) - if os.path.exists(providepkgpath): - for f in os.listdir(providepkgpath): + rprovides = os.listdir(providepkgpath) if os.path.isdir(providepkgpath) else [] + if rprovides: + for f in rprovides: if f != pkg: print("%s is in the RPROVIDES of %s:" % (pkg, f)) pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f) @@ -355,8 +356,9 @@ def package_info(args): for pkg in packages: providepkgpath = os.path.join(args.pkgdata_dir, "runtime-rprovides", pkg) - if os.path.exists(providepkgpath): - for f in os.listdir(providepkgpath): + rprovides = os.listdir(providepkgpath) if os.path.isdir(providepkgpath) else [] + if rprovides: + for f in rprovides: if f != pkg: print("%s is in the RPROVIDES of %s:" % (pkg, f)) pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f) @@ -507,8 +509,9 @@ def list_pkg_files(args): else: providepkgpath = os.path.join(args.pkgdata_dir, "runtime-rprovides", pkg) - if os.path.exists(providepkgpath): - for f in os.listdir(providepkgpath): + rprovides = os.listdir(providepkgpath) if os.path.isdir(providepkgpath) else [] + if rprovides: + for f in rprovides: if f != pkg: print("%s is in the RPROVIDES of %s:" % (pkg, f)) pkgdatafile = os.path.join(args.pkgdata_dir, "runtime", f)
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#237415): https://lists.openembedded.org/g/openembedded-core/message/237415 Mute This Topic: https://lists.openembedded.org/mt/119404685/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
