diff options
Diffstat (limited to 'scripts/lib/recipetool')
-rw-r--r-- | scripts/lib/recipetool/create.py | 2 | ||||
-rw-r--r-- | scripts/lib/recipetool/create_npm.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index bb9fb9b049..aade40b5a8 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -854,7 +854,7 @@ def split_pkg_licenses(licvalues, packages, outlines, fallback_licenses=None, pn | |||
854 | pkglicenses[pn].append(license) | 854 | pkglicenses[pn].append(license) |
855 | outlicenses = {} | 855 | outlicenses = {} |
856 | for pkgname in packages: | 856 | for pkgname in packages: |
857 | license = ' '.join(list(set(pkglicenses.get(pkgname, ['Unknown'])))) | 857 | license = ' '.join(list(set(pkglicenses.get(pkgname, ['Unknown'])))) or 'Unknown' |
858 | if license == 'Unknown' and pkgname in fallback_licenses: | 858 | if license == 'Unknown' and pkgname in fallback_licenses: |
859 | license = fallback_licenses[pkgname] | 859 | license = fallback_licenses[pkgname] |
860 | outlines.append('LICENSE_%s = "%s"' % (pkgname, license)) | 860 | outlines.append('LICENSE_%s = "%s"' % (pkgname, license)) |
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index b3ffcdbc5b..cc4fb42684 100644 --- a/scripts/lib/recipetool/create_npm.py +++ b/scripts/lib/recipetool/create_npm.py | |||
@@ -45,7 +45,7 @@ class NpmRecipeHandler(RecipeHandler): | |||
45 | license = data['license'] | 45 | license = data['license'] |
46 | if isinstance(license, dict): | 46 | if isinstance(license, dict): |
47 | license = license.get('type', None) | 47 | license = license.get('type', None) |
48 | return None | 48 | return license |
49 | 49 | ||
50 | def _shrinkwrap(self, srctree, localfilesdir, extravalues, lines_before): | 50 | def _shrinkwrap(self, srctree, localfilesdir, extravalues, lines_before): |
51 | try: | 51 | try: |