summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/copyleft_compliance.bbclass2
-rw-r--r--meta/classes/license.bbclass5
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/copyleft_compliance.bbclass b/meta/classes/copyleft_compliance.bbclass
index 5d9ab11926..2fe524b5f3 100644
--- a/meta/classes/copyleft_compliance.bbclass
+++ b/meta/classes/copyleft_compliance.bbclass
@@ -48,6 +48,8 @@ def copyleft_should_include(d):
48 licenses = oe.license.flattened_licenses(d.getVar('LICENSE', True), choose_licenses) 48 licenses = oe.license.flattened_licenses(d.getVar('LICENSE', True), choose_licenses)
49 except oe.license.InvalidLicense as exc: 49 except oe.license.InvalidLicense as exc:
50 bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) 50 bb.fatal('%s: %s' % (d.getVar('PF', True), exc))
51 except SyntaxError:
52 bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF', True)))
51 53
52 return all(include_license(lic) for lic in licenses) 54 return all(include_license(lic) for lic in licenses)
53 55
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 96fdb46155..4689aaf615 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -231,7 +231,10 @@ python do_populate_lic() {
231 try: 231 try:
232 v.visit_string(license_types) 232 v.visit_string(license_types)
233 except oe.license.InvalidLicense as exc: 233 except oe.license.InvalidLicense as exc:
234 bb.fatal("%s: %s" % (d.getVar('PF', True), exc)) 234 bb.fatal('%s: %s' % (d.getVar('PF', True), exc))
235 except SyntaxError:
236 bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF', True)))
237
235} 238}
236 239
237SSTATETASKS += "do_populate_lic" 240SSTATETASKS += "do_populate_lic"