[oe-commits] [openembedded-core] 02/26: recipetool: create: fix for regression in npm license handling

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit abe2955df2dc558de6068d9373dfcb47d690704b
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Wed Apr 12 22:41:26 2017 +1200

    recipetool: create: fix for regression in npm license handling
    
    OE-Core commit c0cfd9b1d54b05ad048f444d6fe248aa0500159e added handling
    for AND / OR in license strings coming from npm, but made the assumption
    that an & would always be present in the license value. Check if it's
    there first so we don't fail if it isn't.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/recipetool/create_npm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py
index a215026..eb19555 100644
--- a/scripts/lib/recipetool/create_npm.py
+++ b/scripts/lib/recipetool/create_npm.py
@@ -240,7 +240,8 @@ class NpmRecipeHandler(RecipeHandler):
                     packages['${PN}'] = ''
                     pkglicenses = split_pkg_licenses(licvalues, packages, lines_after, licenses)
                     all_licenses = list(set([item.replace('_', ' ') for pkglicense in pkglicenses.values() for item in pkglicense]))
-                    all_licenses.remove('&')
+                    if '&' in all_licenses:
+                        all_licenses.remove('&')
                     # Go back and update the LICENSE value since we have a bit more
                     # information than when that was written out (and we know all apply
                     # vs. there being a choice, so we can join them with &)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.