[oe-commits] [openembedded-core] 02/03: recipetool: create: fix npm license code regression

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 3e408aadaea85b6f192b34d37d508cbaf3cd7164
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Thu Aug 24 00:14:48 2017 +1200

    recipetool: create: fix npm license code regression
    
    OE-Core commit 1df60b09f7a60427795ec828c9c7180e4e52f98c caused a
    regression in npm handling since it still expected to be able to get the
    results of the license handling, but this no longer happens until after
    the npm plugin is called. Thus, call the license handling function
    ourselves here (which will record this as having been handled so it
    doesn't get done again later).
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/recipetool/create_npm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py
index 6252e91..ae53972 100644
--- a/scripts/lib/recipetool/create_npm.py
+++ b/scripts/lib/recipetool/create_npm.py
@@ -208,11 +208,14 @@ class NpmRecipeHandler(RecipeHandler):
 
                 # Split each npm module out to is own package
                 npmpackages = oe.package.npm_split_package_dirs(srctree)
+                licvalues = None
                 for item in handled:
                     if isinstance(item, tuple):
                         if item[0] == 'license':
                             licvalues = item[1]
                             break
+                if not licvalues:
+                    licvalues = handle_license_vars(srctree, lines_before, handled, extravalues, d)
                 if licvalues:
                     # Augment the license list with information we have in the packages
                     licenses = {}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.