diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-04-12 22:41:26 +1200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-12 22:16:55 +0100 |
| commit | abe2955df2dc558de6068d9373dfcb47d690704b (patch) | |
| tree | 8df37a3d54224baea3ab7ef62ff8bcc23e92e39f | |
| parent | c8749ed1edcbb544f6656ee5da80f2cf647c405a (diff) | |
| download | openembedded-core-abe2955df2dc558de6068d9373dfcb47d690704b.tar.gz openembedded-core-abe2955df2dc558de6068d9373dfcb47d690704b.tar.bz2 openembedded-core-abe2955df2dc558de6068d9373dfcb47d690704b.zip | |
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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/recipetool/create_npm.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index a21502679e..eb19555a8e 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 &) |