summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Flanagan <elizabeth.flanagan@intel.com>2011-12-09 16:05:24 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-10 00:17:25 +0000
commit07f94fa1d661d38b775ce2d99b84e5610c369392 (patch)
tree25b57537f012289d736ab24c9443fe8d5d44fdc7
parent5328587ecaa14a54ad7bced6f7ead218471dbf86 (diff)
downloadopenembedded-core-07f94fa1d661d38b775ce2d99b84e5610c369392.tar.gz
openembedded-core-07f94fa1d661d38b775ce2d99b84e5610c369392.tar.bz2
openembedded-core-07f94fa1d661d38b775ce2d99b84e5610c369392.tar.xz
openembedded-core-07f94fa1d661d38b775ce2d99b84e5610c369392.zip
license/copyleft: exception for ast parse
As the standard for LICENSE format is not well defined, we may well run into issues where LICENSE cannot be parsed via ast. In cases like this, we need to warn and continue. Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 5d9ab1192..2fe524b5f 100644
--- a/meta/classes/copyleft_compliance.bbclass
+++ b/meta/classes/copyleft_compliance.bbclass
@@ -48,6 +48,8 @@ def copyleft_should_include(d):
licenses = oe.license.flattened_licenses(d.getVar('LICENSE', True), choose_licenses)
except oe.license.InvalidLicense as exc:
bb.fatal('%s: %s' % (d.getVar('PF', True), exc))
+ except SyntaxError:
+ bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF', True)))
return all(include_license(lic) for lic in licenses)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 96fdb4615..4689aaf61 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -231,7 +231,10 @@ python do_populate_lic() {
try:
v.visit_string(license_types)
except oe.license.InvalidLicense as exc:
- bb.fatal("%s: %s" % (d.getVar('PF', True), exc))
+ bb.fatal('%s: %s' % (d.getVar('PF', True), exc))
+ except SyntaxError:
+ bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF', True)))
+
}
SSTATETASKS += "do_populate_lic"