aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-23 23:56:33 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-24 00:13:33 +1200
commitcdd76ab80e6c1505a9e29adfed20e5f07a13d265 (patch)
tree7fed628a0c274c340cf7cbf56ac5da3a6dbc91da
parent597e0ce43d451de95397f296a8ed4627ca3ac880 (diff)
downloadopenembedded-core-contrib-paule/recipetool-npm-fixes2.tar.gz
openembedded-core-contrib-paule/recipetool-npm-fixes2.tar.bz2
openembedded-core-contrib-paule/recipetool-npm-fixes2.zip
recipetool: create: fix npm license code regressionpaule/recipetool-npm-fixes2
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@linux.intel.com>
-rw-r--r--scripts/lib/recipetool/create_npm.py3
1 files changed, 3 insertions, 0 deletions
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 = {}