summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-04-28 01:06:18 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-06 10:31:14 +0100
commit6ddd408f6d06c0be85f1a093f18e4e7d57817688 (patch)
tree2166efde15740c2e04f37795dd0fa4580f4370f9 /meta
parentde7562620e5b7f1f1a7a740aa79c0d8d01326867 (diff)
downloadpoky-6ddd408f6d06c0be85f1a093f18e4e7d57817688.tar.gz
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. (From OE-Core rev: 8c522f1f536270e195c8c73f5c72801495e7b33b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/package.py2
1 files changed, 1 insertions, 1 deletions
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):
149 if os.path.exists(pkgfile): 149 if os.path.exists(pkgfile):
150 with open(pkgfile, 'r') as f: 150 with open(pkgfile, 'r') as f:
151 data = json.loads(f.read()) 151 data = json.loads(f.read())
152 packages[pkgname] = (relpth, data) 152 packages[pkgname] = (relpth, data)
153 # We want the main package for a module sorted *after* its subpackages 153 # We want the main package for a module sorted *after* its subpackages
154 # (so that it doesn't otherwise steal the files for the subpackage), so 154 # (so that it doesn't otherwise steal the files for the subpackage), so
155 # this is a cheap way to do that whilst still having an otherwise 155 # this is a cheap way to do that whilst still having an otherwise