From 58057d8749a827da46db23e501684cf8eea2842d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 24 Aug 2017 00:14:48 +1200 Subject: 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). (From OE-Core rev: 3e408aadaea85b6f192b34d37d508cbaf3cd7164) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/lib/recipetool/create_npm.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts/lib') diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index 6252e915b5..ae5397262e 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 = {} -- cgit v1.2.3-54-g00ecf