From 7fab4cd27a2ad896218123ca82252e2b59526726 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 15 Jan 2013 13:22:48 -0700 Subject: 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. Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index cfb816d5a4..cd18e198d4 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): -- cgit 1.2.3-korg