diff options
author | Anders Darander <anders@chargestorm.se> | 2017-03-01 18:19:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-04 23:18:18 +0000 |
commit | 837d89b47bdf9a253952b2752ce2794fe6f90eca (patch) | |
tree | 9e276951f5e122dcf977cda073b5b798b5f60ac6 | |
parent | 2db1227fa245475c021f90dd5c30829f976248b3 (diff) | |
download | poky-837d89b47bdf9a253952b2752ce2794fe6f90eca.tar.gz |
scripts/lib/create_npm: rewrite see license in eula
Rewrite the 'SEE LICENSE IN EULA' to a single string (without
spaces), to avoid splitting the string later on.
(Otherwise, each word gets split, and assumed to be a license
on it's own.
(From OE-Core rev: 39127702cee80c972ee9a447ef4006751f47475e)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/recipetool/create_npm.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index d3fcd99deb..3a88592b73 100644 --- a/scripts/lib/recipetool/create_npm.py +++ b/scripts/lib/recipetool/create_npm.py | |||
@@ -45,8 +45,10 @@ 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 | if 'MIT/X11' in license: | 48 | if license: |
49 | license = 'MIT' | 49 | license = license.replace('MIT/X11', 'MIT') |
50 | license = license.replace('SEE LICENSE IN EULA', | ||
51 | 'SEE-LICENSE-IN-EULA') | ||
50 | return license | 52 | return license |
51 | 53 | ||
52 | def _shrinkwrap(self, srctree, localfilesdir, extravalues, lines_before): | 54 | def _shrinkwrap(self, srctree, localfilesdir, extravalues, lines_before): |