From 616eeb7290ca7de640d4b64e9960b890725d4926 Mon Sep 17 00:00:00 2001 From: Beth Flanagan Date: Sat, 26 Feb 2011 14:04:41 -0800 Subject: Fixing my bad license parsing: license.bbclass Fix to my bad license parsing. Also added the MIT generic license files. Signed-off-by: Beth Flanagan --- meta/classes/license.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 4e3cd1cbdf..9c4ccb31e3 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -66,9 +66,10 @@ 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 (' '.join(license_types.replace('&', ' ').replace('+', ' ').replace('|', ' ') - .replace('(', ' ').replace(')', ' ').replace(';', ' ').replace(',', ' ').split())): - if os.path.isfile(os.path.join(generic_directory, license_type)): + for license_type in ((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: bb.mkdirhier(gen_lic_dest) -- cgit 1.2.3-korg