]> code.ossystems Code Review - openembedded-core.git/commit
recipetool: create: fix falling back to declared license for npm packages
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Wed, 27 Apr 2016 13:06:19 +0000 (01:06 +1200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 29 Jun 2016 18:33:23 +0000 (19:33 +0100)
commit2d96460f2dcac4263f43ebcb7556722ce55c9918
treedf16ec340f3d0a628888de5816678f0fa54a0f11
parent8da9185a1c68c8274269841d0867d7d4abf426f0
recipetool: create: fix falling back to declared license for npm packages

Fix two problems falling back to the "license" field from package.json
when no license file is present:
1) The function that was supposed to return the license field value was
   always explicitly returning None, and this was never noticed (because
   the test cases never exercised the fallback as they provided license
   files for each module).
2) Fix the main package not falling back because it had a default of an
   empty list, which evaluates to '' instead of 'Unknown'.

(From OE-Core rev: 59381a9450949ce6b4b03adb717e950b999830f3)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
scripts/lib/recipetool/create.py
scripts/lib/recipetool/create_npm.py