diff options
| author |   Beth Flanagan <elizabeth.flanagan@intel.com> | 2011-02-26 14:04:41 -0800 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2011-03-01 11:46:47 +0000 |
| commit | 616eeb7290ca7de640d4b64e9960b890725d4926 (patch) | |
| tree | 79d4692e818e0b3dda848644d250bd542669b12e /meta/classes/license.bbclass | |
| parent | b50d7907ca4696a1248b2bcd0b15fa3954c8493c (diff) | |
| download | openembedded-core-contrib-616eeb7290ca7de640d4b64e9960b890725d4926.tar.gz | |
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 <elizabeth.flanagan@intel.com>
Diffstat (limited to 'meta/classes/license.bbclass')
| -rw-r--r-- | meta/classes/license.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
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) |