diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-04-28 01:06:18 +1200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:33:23 +0100 |
| commit | 8da9185a1c68c8274269841d0867d7d4abf426f0 (patch) | |
| tree | c4769b30b8ab6fa3856641fee54b435900f27c91 /meta/lib | |
| parent | c2267c885848b438b52b45dd45c8a217cdb661a6 (diff) | |
| download | openembedded-core-8da9185a1c68c8274269841d0867d7d4abf426f0.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>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/package.py | 2 |
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): 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 |