[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4936/8267] scripts/lib/create_npm: rewrite see license in eula



commit 837d89b47bdf9a253952b2752ce2794fe6f90eca
Author: Anders Darander <anders chargestorm se>
Date:   Wed Mar 1 18:19:59 2017 +0100

    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>

 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 d3fcd99..3a88592 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):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]