[PATCH 42/50] Fix LICENSE parsing: license.bblcass


Koen Kooi
 

From: Beth Flanagan <elizabeth.flanagan@...>

LICENSE parsing was missing some cases. Fixed

Signed-off-by: Beth Flanagan <elizabeth.flanagan@...>
---
meta/classes/license.bbclass | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 97d4e4e..4e3cd1c 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:
--
1.6.6.1