summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2012-01-09 15:48:33 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:00 +0000
commitcace9ddc0edd654877d968643960fa4343472b58 (patch)
tree282d4840d8d83261a4e754a05757811c658a89e8 /meta/classes
parent7903433898b4683a1c09cc9a6a379421bc9bbd58 (diff)
downloadopenembedded-core-cace9ddc0edd654877d968643960fa4343472b58.tar.gz
openembedded-core-cace9ddc0edd654877d968643960fa4343472b58.tar.bz2
openembedded-core-cace9ddc0edd654877d968643960fa4343472b58.zip
oe.license: avoid the need to catch SyntaxError
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/copyleft_compliance.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/copyleft_compliance.bbclass b/meta/classes/copyleft_compliance.bbclass
index 6f058e0f20..2eb9dedd24 100644
--- a/meta/classes/copyleft_compliance.bbclass
+++ b/meta/classes/copyleft_compliance.bbclass
@@ -48,10 +48,8 @@ def copyleft_should_include(d):
try:
is_included, excluded = oe.license.is_included(d.getVar('LICENSE', True), include, exclude)
- except oe.license.InvalidLicense as exc:
+ except oe.license.LicenseError as exc:
bb.fatal('%s: %s' % (d.getVar('PF', True), exc))
- except SyntaxError as exc:
- bb.warn('%s: error when parsing the LICENSE variable: %s' % (d.getVar('P', True), exc))
else:
if is_included:
return True, None