From 8c522f1f536270e195c8c73f5c72801495e7b33b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 28 Apr 2016 01:06:18 +1200 Subject: recipetool: create: fix picking up false npm package directories It is possible for a Node.js module to have node_modules subdirectories that contain no package.json file (e.g. iotivity-node has such a directory). It appears these should simply be ignored, or else with the way the current code works we will get errors later. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 2887689541..252e32d1df 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -149,7 +149,7 @@ def npm_split_package_dirs(pkgdir): if os.path.exists(pkgfile): with open(pkgfile, 'r') as f: data = json.loads(f.read()) - packages[pkgname] = (relpth, data) + packages[pkgname] = (relpth, data) # We want the main package for a module sorted *after* its subpackages # (so that it doesn't otherwise steal the files for the subpackage), so # this is a cheap way to do that whilst still having an otherwise -- cgit 1.2.3-korg