diff options
author | Christopher Larson <chris_larson@mentor.com> | 2012-01-09 15:48:33 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 14:53:19 +0000 |
commit | 19247e44a388a58ea03cc91decb8b18e022efd52 (patch) | |
tree | df6091d530c23ac5ddb49b1fece31c2f62def0db /meta/classes/copyleft_compliance.bbclass | |
parent | 7ce97336aad5e6ecefb5e735a13e345d1b8bd8fb (diff) | |
download | poky-19247e44a388a58ea03cc91decb8b18e022efd52.tar.gz |
oe.license: avoid the need to catch SyntaxError
(From OE-Core rev: cace9ddc0edd654877d968643960fa4343472b58)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/copyleft_compliance.bbclass')
-rw-r--r-- | meta/classes/copyleft_compliance.bbclass | 4 |
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): | |||
48 | 48 | ||
49 | try: | 49 | try: |
50 | is_included, excluded = oe.license.is_included(d.getVar('LICENSE', True), include, exclude) | 50 | is_included, excluded = oe.license.is_included(d.getVar('LICENSE', True), include, exclude) |
51 | except oe.license.InvalidLicense as exc: | 51 | except oe.license.LicenseError as exc: |
52 | bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) | 52 | bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) |
53 | except SyntaxError as exc: | ||
54 | bb.warn('%s: error when parsing the LICENSE variable: %s' % (d.getVar('P', True), exc)) | ||
55 | else: | 53 | else: |
56 | if is_included: | 54 | if is_included: |
57 | return True, None | 55 | return True, None |