From: Anders Darander <anders@chargestorm.se>
Date: Wed, 1 Mar 2017 17:19:59 +0000 (+0100)
Subject: scripts/lib/create_npm: rewrite see license in eula
X-Git-Tag: uninative-1.5~32
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=39127702cee80c972ee9a447ef4006751f47475e;p=openembedded-core.git

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.

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

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):
             license = data['license']
             if isinstance(license, dict):
                 license = license.get('type', None)
-            if 'MIT/X11' in license:
-                license = 'MIT'
+            if license:
+                license = license.replace('MIT/X11', 'MIT')
+                license = license.replace('SEE LICENSE IN EULA',
+                                          'SEE-LICENSE-IN-EULA')
         return license
 
     def _shrinkwrap(self, srctree, localfilesdir, extravalues, lines_before):