summaryrefslogtreecommitdiffstats
path: root/scripts/lib/recipetool/create_npm.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-04-28 01:06:19 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-29 19:35:56 +0100
commit720c9262714436188a5826a81e84235926fd73a6 (patch)
treebb5596bd29605874d5ced85e91adb91f1ff0937e /scripts/lib/recipetool/create_npm.py
parente89f4e531f9b837d4296f3292f1a4d8f8de9530a (diff)
downloadpoky-720c9262714436188a5826a81e84235926fd73a6.tar.gz
recipetool: create: fix falling back to declared license for npm packages
Fix two problems falling back to the "license" field from package.json when no license file is present: 1) The function that was supposed to return the license field value was always explicitly returning None, and this was never noticed (because the test cases never exercised the fallback as they provided license files for each module). 2) Fix the main package not falling back because it had a default of an empty list, which evaluates to '' instead of 'Unknown'. (From OE-Core rev: 59381a9450949ce6b4b03adb717e950b999830f3) (From OE-Core rev: 2d96460f2dcac4263f43ebcb7556722ce55c9918) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/recipetool/create_npm.py')
-rw-r--r--scripts/lib/recipetool/create_npm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py
index b3ffcdbc5b..cc4fb42684 100644
--- a/scripts/lib/recipetool/create_npm.py
+++ b/scripts/lib/recipetool/create_npm.py
@@ -45,7 +45,7 @@ class NpmRecipeHandler(RecipeHandler):
45 license = data['license'] 45 license = data['license']
46 if isinstance(license, dict): 46 if isinstance(license, dict):
47 license = license.get('type', None) 47 license = license.get('type', None)
48 return None 48 return license
49 49
50 def _shrinkwrap(self, srctree, localfilesdir, extravalues, lines_before): 50 def _shrinkwrap(self, srctree, localfilesdir, extravalues, lines_before):
51 try: 51 try: