[gnome-continuous-yocto/gnomeostree-3.28-rocko: 93/8267] recipetool: create: fix picking up false npm package directories



commit 6ddd408f6d06c0be85f1a093f18e4e7d57817688
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Apr 28 01:06:18 2016 +1200

    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>

 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 2887689..252e32d 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]