From: Christopher Larson Date: Tue, 15 Jan 2013 20:22:48 +0000 (-0700) Subject: license.bbclass: cleanly handle invalid licenses in incompatible_license X-Git-Tag: rev_ivi_2015_02_04~14198 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5791dd2b3bc907e20c3a662361fc27092faad2db;p=scm%2Fbb%2Ftizen-distro.git license.bbclass: cleanly handle invalid licenses in incompatible_license This gives us an error message (bb.fatal) rather than a traceback due to the uncaught LicenseError. (From OE-Core rev: 7fab4cd27a2ad896218123ca82252e2b59526726) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index cfb816d..cd18e19 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -237,7 +237,10 @@ def incompatible_license(d, dont_want_licenses, package=None): def choose_lic_set(a, b): return a if all(license_ok(lic) for lic in a) else b - licenses=oe.license.flattened_licenses(license, choose_lic_set) + try: + licenses = oe.license.flattened_licenses(license, choose_lic_set) + except oe.license.LicenseError as exc: + bb.fatal('%s: %s' % (d.getVar('P', True), exc)) return any(not license_ok(l) for l in licenses) def check_license_flags(d):