summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeth Flanagan <elizabeth.flanagan@intel.com>2011-02-25 15:41:09 -0800
committerRichard Purdie <rpurdie@linux.intel.com>2011-03-01 11:46:47 +0000
commit4302a74bb99bdaaa3d793a043caac4d29a97cfec (patch)
tree8104772efb09ce25f6f31e3d140fdf4713c34f1b
parent5da6b66c7e6720e3c7f95af2cd106152ece9241b (diff)
downloadopenembedded-core-4302a74bb99bdaaa3d793a043caac4d29a97cfec.tar.gz
openembedded-core-4302a74bb99bdaaa3d793a043caac4d29a97cfec.tar.bz2
openembedded-core-4302a74bb99bdaaa3d793a043caac4d29a97cfec.zip
[BUG:650] Fix LICENSE parsing: license.bblcass
LICENSE parsing was missing some cases. Fixed Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
-rw-r--r--meta/classes/license.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 97d4e4e41e..4e3cd1cbdf 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -66,7 +66,8 @@ python do_populate_lic() {
# I'm sure someone has written a logic parser for these fields, but if so, I don't know where it is.
# So what I do is just link to every license mentioned in the license field.
- for license_type in license_types.replace('&', '').replace('+', '').replace('&', '').replace('|', '').replace('(', '').replace(')', '').split():
+ for license_type in (' '.join(license_types.replace('&', ' ').replace('+', ' ').replace('|', ' ')
+ .replace('(', ' ').replace(')', ' ').replace(';', ' ').replace(',', ' ').split())):
if os.path.isfile(os.path.join(generic_directory, license_type)):
gen_lic_dest = os.path.join(bb.data.getVar('LICENSE_DIRECTORY', d, True), "common-licenses")
try: